From b12ea16fa2d9440e9680127d126a4f3af450afd2 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期二, 17 十月 2023 18:36:19 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/adjust-style
---
src/views/overview/AddOverviewDialog.vue | 25 +-
src/views/productManage/product/index.vue | 14
src/views/productManage/productCategory/AddProductCategoryDialog.vue | 236 +++++++++++++---------------
src/components/makepager/FormBtnsView.vue | 7
src/components/makepager/StatusCommonView.vue | 16 +
src/views/productManage/product/AddProductDialog.vue | 169 ++++++++-------------
6 files changed, 214 insertions(+), 253 deletions(-)
diff --git a/src/components/makepager/FormBtnsView.vue b/src/components/makepager/FormBtnsView.vue
index 1a31735..eee8037 100644
--- a/src/components/makepager/FormBtnsView.vue
+++ b/src/components/makepager/FormBtnsView.vue
@@ -142,13 +142,16 @@
<style lang="scss" scoped>
.content-number {
display: flex;
- justify-content: right;
+ // justify-content: left;
height: 44px;
- border-bottom: 1px solid #e9e9e9;
+ // border-bottom: 1px solid #e9e9e9;
+ padding: 0px 10px;
font-size: 13px;
.sub-number {
width: 12.5%;
border-right: 1px solid #e9e9e9;
+ border-top: 1px solid #e9e9e9;
+ border-bottom: 1px solid #e9e9e9;
display: flex;
padding: 3px 9px;
.left {
diff --git a/src/components/makepager/StatusCommonView.vue b/src/components/makepager/StatusCommonView.vue
index f4889cb..9361001 100644
--- a/src/components/makepager/StatusCommonView.vue
+++ b/src/components/makepager/StatusCommonView.vue
@@ -10,7 +10,7 @@
class="arrowsItem"
v-for="(item, index) in list"
:key="index"
- :style="item.status === 'active' && index === 0 ? { background: '#495057' } : ''"
+ :style="item.status === 'active' && index === 0 ? { background: '#2a78fb' } : ''"
>
<div
class="arrows_up arrows"
@@ -87,10 +87,13 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
.common-status {
- overflow: hidden;
- border: 1px solid #e9e9e9;
+ // overflow: hidden;
+ // border: 1px solid #e9e9e9;
display: flex;
align-items: center;
+ margin: 10px 30px;
+ padding-bottom: 10px;
+ border-bottom: 1px solid #e9e9e9;
.arrowsBox {
margin-left: auto;
display: flex;
@@ -102,15 +105,20 @@
position: relative;
height: 100%;
width: 80px;
+ z-index: 9999;
.arrows_up {
+ box-sizing: border-box;
transform-origin: right top;
transform: skewX(30deg);
+ border-top: 1px solid #e9e9e9;
border-right: 1px solid #e9e9e9;
}
.arrows_down {
+ box-sizing: border-box;
transform-origin: right bottom;
transform: skewX(-30deg);
border-right: 1px solid #e9e9e9;
+ border-bottom: 1px solid #e9e9e9;
}
&:first-child {
border-left: 1px solid #e9e9e9;
@@ -132,7 +140,7 @@
// background: #edf9ff;
// }
.arrows_active {
- background: #495057;
+ background: #2a78fb;
}
// .arrows_todo {
// background: #2c2c2c;
diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index 7a943b6..2da5599 100644
--- a/src/views/overview/AddOverviewDialog.vue
+++ b/src/views/overview/AddOverviewDialog.vue
@@ -173,7 +173,7 @@
<el-tab-pane label="鍏朵粬淇℃伅" name="second">
<div class="purchase-view">
<div class="left">
- <div class="second-label">鍏朵粬淇℃伅</div>
+ <!-- <div class="second-label">鍏朵粬淇℃伅</div> -->
<!-- <el-form-item v-if="workType !== 1" label="閫佽揣绛栫暐" prop="client_name">
<el-select
v-model="editConfig.infomation.memberId"
@@ -722,13 +722,13 @@
height: calc(100% - 80px);
overflow: auto;
margin: 20px;
- border: 1px solid #dcdfe6;
- box-shadow: inset 0 0 2px #dee2e6;
- -moz-box-shadow: inset 0 0 2px #dee2e6;
- -webkit-box-shadow: inset 0 0 2px #dee2e6;
- .basic-info-view {
- margin-top: 20px;
- }
+ // border: 1px solid #dcdfe6;
+ // box-shadow: inset 0 0 2px #dee2e6;
+ // -moz-box-shadow: inset 0 0 2px #dee2e6;
+ // -webkit-box-shadow: inset 0 0 2px #dee2e6;
+ // .basic-info-view {
+ // margin-top: 20px;
+ // }
}
.purchase-view {
display: flex;
@@ -755,13 +755,18 @@
color: #333;
}
}
- .el-tabs--card > .el-tabs__header .el-tabs__nav {
- margin-left: 20px;
+ .el-tabs--card > .el-tabs__header {
+ border-bottom: none;
+ }
+ .el-tabs__item.is-active {
+ color: #fff;
+ background: #2a78fb;
}
.el-tabs__item {
height: 30px;
line-height: 30px;
font-size: 13px;
+ background: #f3f3f3;
}
}
</style>
diff --git a/src/views/productManage/product/AddProductDialog.vue b/src/views/productManage/product/AddProductDialog.vue
index 99d483a..94df055 100644
--- a/src/views/productManage/product/AddProductDialog.vue
+++ b/src/views/productManage/product/AddProductDialog.vue
@@ -1,14 +1,14 @@
<template>
<div class="add-common">
<el-dialog
- :title="editCommonConfig.title + '閲囪喘鍏ュ簱'"
+ :title="editCommonConfig.title + '浜у搧'"
:visible.sync="editConfig.visible"
:width="dialogWidth"
:before-close="handleClose"
>
<!-- 澶� -->
<div slot="title" class="dialog-header">
- <span>{{ editCommonConfig.title + "閲囪喘鍏ュ簱" }}</span>
+ <span>{{ editCommonConfig.title + "浜у搧" }}</span>
<div class="header_btns">
<span class="btn">
<i class="el-icon-printer"></i>
@@ -26,16 +26,16 @@
ref="form"
:model="editConfig.infomation"
:rules="rules"
- label-position="left"
+ label-position="right"
label-width="110px"
size="mini"
- style="height: 60vh; overflow-x: hidden"
+ style="height: 53vh; overflow-x: hidden"
>
- <div class="content-btn">
+ <!-- <div class="content-btn">
<el-button plain size="mini" disabled>鏍囩鎵撳嵃</el-button>
<el-button plain size="mini" disabled>鏇存柊鏁伴噺</el-button>
<el-button plain size="mini" disabled>鎵ц琛ヨ揣</el-button>
- </div>
+ </div> -->
<div class="basic-info">
<FormBtnsView
:add-product="addProduct"
@@ -43,32 +43,6 @@
:show-procure="showProcure"
:show-sale="showSale"
/>
- <div class="basic-info-view">
- <el-row>
- <el-col :span="23">
- <div style="margin-left: 20px"><span style="color: #f56c6c">*</span>浜у搧鍚嶇О</div>
- <el-form-item label="" prop="name" label-width="20px">
- <el-input v-model="editConfig.infomation.name" placeholder="" :disabled="!showFooter"></el-input>
- </el-form-item>
- </el-col>
- <!-- <el-col :span="4">
- <div class="upload" @click="toGetImg">
- <img v-if="imageSrc" :src="imageSrc" style="height: 90px; width: 90px" />
- <div v-else class="upload-icon"><i class="el-icon-plus"></i></div>
- </div>
- </el-col> -->
- <!-- <el-col :span="24">
- <div style="margin-left: 20px">
- <el-checkbox v-model="marketable" :disabled="!showFooter" @change="checkboxChange('閿�鍞�', $event)"
- >鍙攢鍞�</el-checkbox
- >
- <el-checkbox v-model="procurable" :disabled="!showFooter" @change="checkboxChange('閲囪喘', $event)"
- >鍙噰璐�</el-checkbox
- >
- </div>
- </el-col> -->
- </el-row>
- </div>
<div class="bottom">
<el-tabs v-model="activeName" type="card">
<el-tab-pane label="鍩烘湰淇℃伅" name="first"></el-tab-pane>
@@ -81,7 +55,15 @@
<div v-if="activeName === 'first'">
<div class="purchase-view">
<div class="left">
- <el-form-item label="浜у搧绫诲瀷" prop="productType" style="margin-left: 20px">
+ <el-form-item label="浜у搧鍚嶇О" prop="name">
+ <el-input
+ v-model="editConfig.infomation.name"
+ placeholder=""
+ :disabled="!showFooter"
+ style="width: 85%"
+ ></el-input>
+ </el-form-item>
+ <el-form-item label="浜у搧绫诲瀷" prop="productType">
<el-select
v-model="editConfig.infomation.productType"
placeholder="璇烽�夋嫨"
@@ -93,7 +75,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="寮�绁ㄧ瓥鐣�" prop="invoicingStrategy" style="margin-left: 20px">
+ <!-- <el-form-item label="寮�绁ㄧ瓥鐣�" prop="invoicingStrategy" >
<el-select
v-model="editConfig.infomation.invoicingStrategy"
placeholder="璇烽�夋嫨"
@@ -106,8 +88,8 @@
</el-select>
<div class="font_size_13" style="color: gray">鍙偍瀛樼殑浜у搧鏄偍绠＄悊搴撳瓨姘村钩鐨勫疄鐗╅」鐩��</div>
<div class="font_size_13" style="color: gray">鎮ㄥ彲浠ュ湪鍙戣揣鍓嶄负鍏跺紑鍏风粨绠楀崟銆�</div>
- </el-form-item>
- <el-form-item label="鐗╂枡绫诲瀷" prop="model" style="margin-left: 20px">
+ </el-form-item> -->
+ <el-form-item label="鐗╂枡绫诲瀷" prop="model">
<el-select
v-model="editConfig.infomation.model"
placeholder="璇烽�夋嫨"
@@ -121,7 +103,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="鍗曚綅" prop="unit" style="margin-left: 20px">
+ <el-form-item label="鍗曚綅" prop="unit">
<el-input
v-model="editConfig.infomation.unit"
placeholder="璇疯緭鍏�"
@@ -129,7 +111,7 @@
:disabled="!showFooter"
></el-input>
</el-form-item>
- <el-form-item label="浜у搧鏍囩" prop="productTagName" style="margin-left: 20px">
+ <el-form-item label="浜у搧鏍囩" prop="productTagName">
<el-input
v-model="editConfig.infomation.productTagName"
placeholder="璇疯緭鍏�"
@@ -139,8 +121,8 @@
</el-form-item>
</div>
<div class="right">
- <el-form-item label="閿�鍞环鏍�" prop="salePrice" style="margin-left: 20px">
- <span>锟�</span>
+ <el-form-item label="閿�鍞环鏍�" prop="salePrice">
+ <!-- <span>锟�</span> -->
<el-input-number
v-model.trim="editConfig.infomation.salePrice"
placeholder="璇疯緭鍏�"
@@ -151,7 +133,7 @@
:disabled="!showFooter"
></el-input-number>
</el-form-item>
- <el-form-item label="閿�椤圭◣" prop="customerTaxes" style="margin-left: 20px">
+ <!-- <el-form-item label="閿�椤圭◣" prop="customerTaxes" >
<el-input-number
v-model="editConfig.infomation.customerTaxes"
placeholder="璇疯緭鍏�"
@@ -160,9 +142,9 @@
style="width: 85%; margin-right: 5px"
:disabled="!showFooter"
></el-input-number>
- </el-form-item>
- <el-form-item label="鎴愭湰" prop="cost" style="margin-left: 20px">
- <span>锟�</span>
+ </el-form-item> -->
+ <el-form-item label="鎴愭湰" prop="cost">
+ <!-- <span>锟�</span> -->
<el-input-number
v-model.trim="editConfig.infomation.cost"
placeholder="璇疯緭鍏�"
@@ -173,7 +155,7 @@
:disabled="!showFooter"
></el-input-number>
</el-form-item>
- <el-form-item label="浜у搧绫诲埆" prop="categoryId" style="margin-left: 20px">
+ <el-form-item label="浜у搧绫诲埆" prop="categoryId">
<el-select
v-model="editConfig.infomation.categoryId"
placeholder="璇烽�夋嫨"
@@ -190,7 +172,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="鍐呴儴鍙傝��" prop="internalReference" style="margin-left: 20px">
+ <el-form-item label="鍐呴儴缂栫爜" prop="internalReference">
<el-input
v-model.trim="editConfig.infomation.internalReference"
placeholder="璇疯緭鍏�"
@@ -199,7 +181,7 @@
:disabled="!showFooter"
></el-input>
</el-form-item>
- <el-form-item label="鏉＄爜" prop="barcode" style="margin-left: 20px">
+ <el-form-item label="鏉＄爜" prop="barcode">
<el-input
v-model.trim="editConfig.infomation.barcode"
placeholder="璇疯緭鍏�"
@@ -211,8 +193,8 @@
</div>
</div>
<div class="all">
- <div class="second-label">鍐呴儴璇存槑</div>
- <el-form-item label="" prop="internalNotes" style="margin-left: 20px" label-width="0px">
+ <!-- <div class="second-label">澶囨敞</div> -->
+ <el-form-item label="澶囨敞" prop="internalNotes">
<el-input
v-model.trim="editConfig.infomation.internalNotes"
placeholder="璇疯緭鍏�"
@@ -235,7 +217,7 @@
<div class="purchase-view">
<!-- <div class="left">
<div class="second-label">鎿嶄綔</div>
- <el-form-item label="璺嚎" prop="checkedRoute" style="margin-left: 20px">
+ <el-form-item label="璺嚎" prop="checkedRoute" >
<el-checkbox-group v-model="checkedRoute" :min="1" :max="2">
<el-checkbox v-for="city in route" :label="city" :key="city" class="list-item">{{
city.length > 20 ? city.substring(0, 20) + "..." : city
@@ -244,7 +226,7 @@
</el-form-item>
</div> -->
<div class="left">
- <el-form-item label="璐熻矗浜�" prop="principal" style="margin-left: 20px" label-width="80px">
+ <el-form-item label="璐熻矗浜�" prop="principal" label-width="80px">
<el-select
v-model="editConfig.infomation.principal"
placeholder="璇烽�夋嫨"
@@ -256,7 +238,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="閲嶉噺" prop="weight" style="margin-left: 20px" label-width="80px">
+ <el-form-item label="閲嶉噺" prop="weight" label-width="80px">
<el-input-number
v-model="editConfig.infomation.weight"
placeholder="璇疯緭鍏�"
@@ -268,7 +250,7 @@
></el-input-number>
<span> kg</span>
</el-form-item>
- <el-form-item label="浣撶Н" prop="volume" style="margin-left: 20px" label-width="80px">
+ <el-form-item label="浣撶Н" prop="volume" label-width="80px">
<el-input-number
v-model="editConfig.infomation.volume"
placeholder="璇疯緭鍏�"
@@ -282,12 +264,7 @@
</el-form-item>
</div>
<div class="right">
- <el-form-item
- label="鍒堕�犲墠缃椂闂�"
- prop="makeAdvanceTime"
- style="margin-left: 20px"
- label-width="130px"
- >
+ <el-form-item label="鍒堕�犲墠缃椂闂�" prop="makeAdvanceTime" label-width="130px">
<el-input-number
v-model="editConfig.infomation.makeAdvanceTime"
placeholder="璇疯緭鍏�"
@@ -299,12 +276,7 @@
></el-input-number>
<span> 澶╂暟</span>
</el-form-item>
- <el-form-item
- label="鐢熶骇璁㈠崟鍑嗗澶╂暟"
- prop="orderAdvanceTime"
- style="margin-left: 20px"
- label-width="130px"
- >
+ <el-form-item label="鐢熶骇璁㈠崟鍑嗗澶╂暟" prop="orderAdvanceTime" label-width="130px">
<el-input-number
v-model="editConfig.infomation.orderAdvanceTime"
placeholder="璇疯緭鍏�"
@@ -316,12 +288,7 @@
></el-input-number>
<span> 澶╂暟</span>
</el-form-item>
- <el-form-item
- label="瀹㈡埛鍓嶇疆鏃堕棿"
- prop="deliveryAdvanceTime"
- style="margin-left: 20px"
- label-width="130px"
- >
+ <el-form-item label="瀹㈡埛鍓嶇疆鏃堕棿" prop="deliveryAdvanceTime" label-width="130px">
<el-input-number
v-model="editConfig.infomation.deliveryAdvanceTime"
placeholder="璇疯緭鍏�"
@@ -335,10 +302,10 @@
</el-form-item>
</div>
</div>
- <div class="purchase-view">
+ <!-- <div class="purchase-view">
<div class="left">
<div class="second-label">鏀惰揣璇存槑</div>
- <el-form-item label="" prop="inStorageExplain" style="margin-left: 20px" label-width="0px">
+ <el-form-item label="" prop="inStorageExplain" label-width="0px">
<el-input
v-model.trim="editConfig.infomation.inStorageExplain"
placeholder="姝よ鏄庢坊鍔犲埌鏀惰揣璁㈠崟涓�(渚嬪锛屼骇鍝佸湪浠撳簱鐨勫瓨鍌ㄤ綅缃�)"
@@ -352,7 +319,7 @@
</div>
<div class="right">
<div class="second-label">鍑哄簱鍗曡鏄�</div>
- <el-form-item label="" prop="outStorageExplain" style="margin-left: 20px" label-width="0px">
+ <el-form-item label="" prop="outStorageExplain" label-width="0px">
<el-input
v-model.trim="editConfig.infomation.outStorageExplain"
placeholder="姝ら�氱煡宸叉坊鍔犲埌閫佽揣鍗曚腑"
@@ -368,7 +335,7 @@
<div class="purchase-view">
<div class="left">
<div class="second-label">鍐呴儴璋冩嫧璇存槑</div>
- <el-form-item label="" prop="internalTransferExplain" style="margin-left: 20px" label-width="0px">
+ <el-form-item label="" prop="internalTransferExplain" label-width="0px">
<el-input
v-model.trim="editConfig.infomation.internalTransferExplain"
placeholder="姝よ鏄庢坊鍔犲埌鍐呴儴璋冩嫧璁㈠崟涓�(渚嬪锛屽湪浠撳簱涓綍澶勬彁鍙栦骇鍝�)"
@@ -381,7 +348,7 @@
</el-form-item>
</div>
<div class="right"></div>
- </div>
+ </div> -->
</div>
<!-- 涓嬮潰涓嶈鍒� 浜屾湡鎴栦笁鏈熶細鐢ㄥ埌 -->
<!-- 閿�鍞� -->
@@ -389,7 +356,7 @@
<div class="purchase-view">
<div class="left">
<div class="second-label">{{ "鍔犲敭&浜ゅ弶閿�鍞�" }}</div>
- <el-form-item label="鍙�変骇鍝�" prop="selectProduct" style="margin-left: 20px">
+ <el-form-item label="鍙�変骇鍝�" prop="selectProduct" >
<el-select
v-model="editConfig.infomation.selectProduct"
multiple
@@ -408,7 +375,7 @@
</el-select>
</el-form-item>
<div class="second-label">閿�鍞鏄�</div>
- <el-form-item label="" prop="sellExplain" style="margin-left: 20px" label-width="20px">
+ <el-form-item label="" prop="sellExplain" label-width="20px">
<el-input
v-model.trim="editConfig.infomation.sellExplain"
size="mini"
@@ -443,7 +410,7 @@
<div class="purchase-view">
<div class="left">
<div class="second-label">渚涘簲鍟嗚处鍗�</div>
- <el-form-item label="杩涢」绋�" prop="client_name" style="margin-left: 20px">
+ <el-form-item label="杩涢」绋�" prop="client_name" >
<el-select
v-model="editConfig.infomation.memberId"
multiple
@@ -456,7 +423,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="鎺у埗绛栫暐" prop="client_name" style="margin-left: 20px">
+ <el-form-item label="鎺у埗绛栫暐" prop="client_name" >
<el-radio-group v-model="editConfig.infomation.resource">
<el-radio label="璁㈠崟鏁伴噺"></el-radio>
<el-radio label="鏀跺埌鏁伴噺"></el-radio>
@@ -465,7 +432,7 @@
</div>
<div class="right">
<div class="second-label">閲囪喘璇存槑</div>
- <el-form-item label="" prop="name" style="margin-left: 20px" label-width="0px">
+ <el-form-item label="" prop="name" label-width="0px">
<el-input
v-model.trim="editConfig.infomation.desc"
placeholder="鏈潯澶囨敞琚坊鍔犲埌閲囪喘璁㈠崟"
@@ -794,16 +761,19 @@
.basic-info {
height: calc(100% - 80px);
overflow: auto;
- margin: 20px;
- border: 1px solid #dcdfe6;
- box-shadow: inset 0 0 2px #dee2e6;
- -moz-box-shadow: inset 0 0 2px #dee2e6;
- -webkit-box-shadow: inset 0 0 2px #dee2e6;
+ margin: 10px;
+ // border: 1px solid #dcdfe6;
+ // box-shadow: inset 0 0 2px #dee2e6;
+ // -moz-box-shadow: inset 0 0 2px #dee2e6;
+ // -webkit-box-shadow: inset 0 0 2px #dee2e6;
+ .bottom {
+ margin-top: 10px;
+ }
.content-number {
display: flex;
justify-content: right;
height: 44px;
- border-bottom: 1px solid #e9e9e9;
+ // border-bottom: 1px solid #e9e9e9;
font-size: 13px;
.sub-number {
width: 12.5%;
@@ -827,22 +797,6 @@
height: 38px;
line-height: 38px;
}
- }
- }
- }
- .basic-info-view {
- margin-top: 20px;
- .upload {
- position: relative;
- width: 90px;
- height: 90px;
- margin-left: 40px;
- border: 1px dotted #d9d9d9;
- border-radius: 4px;
- .upload-icon {
- position: absolute;
- top: 40%;
- right: 43%;
}
}
}
@@ -902,13 +856,18 @@
color: #333;
}
}
- .el-tabs--card > .el-tabs__header .el-tabs__nav {
- margin-left: 20px;
+ .el-tabs--card > .el-tabs__header {
+ border-bottom: none;
+ }
+ .el-tabs__item.is-active {
+ color: #fff;
+ background: #2a78fb;
}
.el-tabs__item {
height: 30px;
line-height: 30px;
font-size: 13px;
+ background: #f3f3f3;
}
.el-input__inner {
text-align: left;
diff --git a/src/views/productManage/product/index.vue b/src/views/productManage/product/index.vue
index b66f494..7e5f5cd 100644
--- a/src/views/productManage/product/index.vue
+++ b/src/views/productManage/product/index.vue
@@ -14,16 +14,16 @@
<div class="icon-view">
<span
class="icon-label"
- @click="selIconSwitchClick('1')"
- :class="{ blueBackgroud: isIconIndex === '1', whiteBackgroud: isIconIndex === '2' }"
- ><i class="el-icon-menu"></i
- ></span>
- <span
- class="icon-label"
@click="selIconSwitchClick('2')"
:class="{ whiteBackgroud: isIconIndex === '1', blueBackgroud: isIconIndex === '2' }"
style="margin-left: 5px"
><i class="el-icon-s-unfold"></i
+ ></span>
+ <span
+ class="icon-label"
+ @click="selIconSwitchClick('1')"
+ :class="{ blueBackgroud: isIconIndex === '1', whiteBackgroud: isIconIndex === '2' }"
+ ><i class="el-icon-menu"></i
></span>
</div>
</div>
@@ -101,7 +101,7 @@
title: "鏂板缓",
infomation: {}
},
- isIconIndex: "1", // 1 鍥炬爣 2 鍒楄〃
+ isIconIndex: "2", // 1 鍥炬爣 2 鍒楄〃
url: "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
pageSizes: [15, 30],
keyWord: "",
diff --git a/src/views/productManage/productCategory/AddProductCategoryDialog.vue b/src/views/productManage/productCategory/AddProductCategoryDialog.vue
index ef39125..841d7b4 100644
--- a/src/views/productManage/productCategory/AddProductCategoryDialog.vue
+++ b/src/views/productManage/productCategory/AddProductCategoryDialog.vue
@@ -25,14 +25,7 @@
>鍒犻櫎</el-button
> -->
</span>
- <el-button
- v-if="showEdit"
- plain
- size="mini"
- style="margin-left: 15px"
- @click="editClick"
- >缂栬緫</el-button
- >
+ <el-button v-if="showEdit" plain size="mini" style="margin-left: 15px" @click="editClick">缂栬緫</el-button>
</div>
</div>
<!-- 鍐呭 -->
@@ -40,16 +33,16 @@
ref="form"
:model="editConfig.infomation"
:rules="rules"
- label-position="left"
+ label-position="right"
label-width="110px"
size="mini"
- style="height: 60vh; overflow-x: hidden"
+ style="height: 290px; overflow-x: hidden"
>
<div class="basic-info">
<FormBtnsView :showProduct="true" @productClick="productClick" />
<div class="basic-info-view">
- <el-row>
- <el-col :span="24">
+ <!-- <el-row> -->
+ <!-- <el-col :span="24">
<div style="margin-left: 20px"><span class="color_F56C6C">*</span>绫诲埆</div>
<el-form-item label="" prop="name" label-width="20px">
<el-input
@@ -59,13 +52,9 @@
style="width: 85%"
></el-input>
</el-form-item>
- </el-col>
- <el-col :span="24">
- <el-form-item
- label="涓婄骇鍝佺被"
- prop="parentId"
- style="margin-left: 20px"
- >
+ </el-col> -->
+ <!-- <el-col :span="24">
+ <el-form-item label="涓婄骇鍝佺被" prop="parentId" style="margin-left: 20px">
<el-select
v-model="editConfig.infomation.parentId"
placeholder="璇烽�夋嫨"
@@ -73,22 +62,37 @@
style="width: 45%"
:disabled="!showFooter"
>
- <el-option
- v-for="item in productCategoryList"
- :key="item.id"
- :label="item.name"
- :value="item.id"
- >
+ <el-option v-for="item in productCategoryList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
- </el-row>
+ </el-row> -->
</div>
<div class="bottom">
<div class="purchase-view">
<div class="left">
- <div class="second-label">鐗╂祦</div>
+ <!-- <div class="second-label">鐗╂祦</div> -->
+ <el-form-item label="绫诲埆" prop="name">
+ <el-input
+ v-model="editConfig.infomation.name"
+ placeholder=""
+ :disabled="!showFooter"
+ style="width: 85%"
+ ></el-input>
+ </el-form-item>
+ <el-form-item label="涓婄骇鍝佺被" prop="parentId">
+ <el-select
+ v-model="editConfig.infomation.parentId"
+ placeholder="璇烽�夋嫨"
+ size="mini"
+ style="width: 85%"
+ :disabled="!showFooter"
+ >
+ <el-option v-for="item in productCategoryList" :key="item.id" :label="item.name" :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
<!-- <el-form-item label="璺嚎" prop="client_name" style="margin-left: 20px">
<el-select
v-model="editConfig.infomation.memberId"
@@ -102,16 +106,12 @@
</el-option>
</el-select>
</el-form-item> -->
- <el-form-item
- label="寮哄埗涓嬫灦绛栫暐"
- prop="forceRemovalStrategy"
- style="margin-left: 20px"
- >
+ <el-form-item label="寮哄埗涓嬫灦绛栫暐" prop="forceRemovalStrategy">
<el-select
v-model="editConfig.infomation.forceRemovalStrategy"
placeholder="璇烽�夋嫨"
size="mini"
- style="width: 63%"
+ style="width: 85%"
:disabled="!showFooter"
>
<el-option
@@ -125,38 +125,25 @@
</el-form-item>
</div>
<div class="right">
- <div class="second-label">搴撳瓨璁′环</div>
- <el-form-item
- label="鎴愭湰鏂规硶"
- prop="costingMethod"
- style="margin-left: 20px"
- >
+ <!-- <div class="second-label">搴撳瓨璁′环</div> -->
+ <el-form-item label="鎴愭湰鏂规硶" prop="costingMethod">
<el-select
v-model="editConfig.infomation.costingMethod"
placeholder="璇烽�夋嫨"
size="mini"
- style="width: 63%"
+ style="width: 85%"
:disabled="!showFooter"
>
- <el-option
- v-for="item in costingMethodList"
- :key="item.id"
- :label="item.name"
- :value="item.id"
- >
+ <el-option v-for="item in costingMethodList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
- <el-form-item
- label="搴撳瓨璁′环"
- prop="inventoryValuation"
- style="margin-left: 20px"
- >
+ <el-form-item label="搴撳瓨璁′环" prop="inventoryValuation">
<el-select
v-model="editConfig.infomation.inventoryValuation"
placeholder="璇烽�夋嫨"
size="mini"
- style="width: 63%"
+ style="width: 85%"
:disabled="!showFooter"
>
<el-option
@@ -176,25 +163,17 @@
<!-- 灏� -->
<div v-if="showFooter" slot="footer" class="dialog-footer">
<!-- <el-button type="primary" size="small" @click="editConfig.visible = false">淇濆苟鎻愪氦瀹℃壒</el-button> -->
- <el-button type="primary" size="small" @click="saveClick('form')"
- >淇濆瓨</el-button
- >
- <el-button size="small" @click="editConfig.visible = false"
- >鍙栨秷</el-button
- >
+ <el-button type="primary" size="small" @click="saveClick('form')">淇濆瓨</el-button>
+ <el-button size="small" @click="editConfig.visible = false">鍙栨秷</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
-import {
- addProductCategory,
- updateProductCategory,
- deleteProductCategory,
-} from "@/api/product/productCategory";
+import { addProductCategory, updateProductCategory, deleteProductCategory } from "@/api/product/productCategory"
-import { getDataByType } from "@/api/data";
+import { getDataByType } from "@/api/data"
export default {
name: "AddProductCategoryDialog",
props: {
@@ -204,16 +183,16 @@
return {
visible: false,
title: "鏂板缓",
- infomation: { type: [] },
- };
- },
+ infomation: { type: [] }
+ }
+ }
},
productCategoryList: {
type: Array,
default: () => {
- return [];
- },
- },
+ return []
+ }
+ }
},
components: {},
computed: {},
@@ -222,7 +201,7 @@
dialogWidth: "50%",
editConfig: this.editCommonConfig,
rules: {
- name: [{ required: true, message: "璇疯緭鍏�", trigger: "change" }],
+ name: [{ required: true, message: "璇疯緭鍏�", trigger: "change" }]
},
forceRemovalStrategyList: getDataByType("forceRemovalStrategy"),
// 鎴愭湰鏂规硶
@@ -234,93 +213,93 @@
showButton: true,
showEdit: false, // 鏄惁鏄剧ず缂栬緫鎸夐挳
isDelClick: false, // 鍒犻櫎鎸夐挳鏄惁鍙偣鍑�
- showFooter: false, // 鏄惁鏄剧ず鍙栨秷淇濆瓨
- };
+ showFooter: false // 鏄惁鏄剧ず鍙栨秷淇濆瓨
+ }
},
created() {
- this.setBottonView();
+ this.setBottonView()
},
methods: {
// 璁剧疆鍒犻櫎/鎵撳嵃/缂栬緫鏄惁鏄剧ず
setBottonView() {
if (this.editConfig.title === "鏂板缓") {
- this.showButton = false;
- this.showEdit = false;
- this.showFooter = true;
+ this.showButton = false
+ this.showEdit = false
+ this.showFooter = true
} else {
- this.showEdit = true;
- this.showFooter = false;
+ this.showEdit = true
+ this.showFooter = false
}
},
// 鍏抽棴
handleClose() {
- this.editConfig.visible = false;
+ this.editConfig.visible = false
},
// 鍒櫎
deleteClick() {
- let data = JSON.parse(JSON.stringify(this.editConfig.infomation));
+ let data = JSON.parse(JSON.stringify(this.editConfig.infomation))
deleteProductCategory({ id: data.id }).then((res) => {
if (res.code === 200) {
- this.editConfig.visible = false;
- this.$message.success("鍒櫎鎴愬姛!");
- this.$emit("refresh");
+ this.editConfig.visible = false
+ this.$message.success("鍒櫎鎴愬姛!")
+ this.$emit("refresh")
} else {
- this.$message.warning(res.msg?res.msg:"鍒犻櫎澶辫触!")
- }
- });
+ this.$message.warning(res.msg ? res.msg : "鍒犻櫎澶辫触!")
+ }
+ })
},
// 缂栬緫
editClick() {
- this.showEdit = false;
- this.showButton = false;
- this.showFooter = true;
+ this.showEdit = false
+ this.showButton = false
+ this.showFooter = true
},
saveParams() {
- let data = JSON.parse(JSON.stringify(this.editConfig.infomation));
+ let data = JSON.parse(JSON.stringify(this.editConfig.infomation))
let params = {
costingMethod: data.costingMethod,
forceRemovalStrategy: data.forceRemovalStrategy,
inventoryValuation: data.inventoryValuation,
name: data.name,
- parentId: data.parentId,
- };
- if (data.id) {
- params.id = data.id;
+ parentId: data.parentId
}
- return params;
+ if (data.id) {
+ params.id = data.id
+ }
+ return params
},
// 淇濆瓨
saveClick(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
- const params = this.saveParams();
+ const params = this.saveParams()
if (this.editConfig.title === "鏂板缓") {
addProductCategory(params).then((res) => {
if (res.code === 200) {
- this.editConfig.visible = false;
- this.$message.success("娣诲姞鎴愬姛!");
- this.$emit("refresh");
+ this.editConfig.visible = false
+ this.$message.success("娣诲姞鎴愬姛!")
+ this.$emit("refresh")
} else {
- this.$message.warning(res.msg?res.msg:"娣诲姞澶辫触!")
- }
- });
+ this.$message.warning(res.msg ? res.msg : "娣诲姞澶辫触!")
+ }
+ })
} else {
updateProductCategory(params).then((res) => {
if (res.code === 200) {
- this.editConfig.visible = false;
- this.$message.success("缂栬緫鎴愬姛!");
- this.$emit("refresh");
+ this.editConfig.visible = false
+ this.$message.success("缂栬緫鎴愬姛!")
+ this.$emit("refresh")
} else {
- this.$message.warning(res.msg?res.msg:"缂栬緫澶辫触!")
- }
- });
+ this.$message.warning(res.msg ? res.msg : "缂栬緫澶辫触!")
+ }
+ })
}
} else {
- console.log("error submit");
- return false;
+ console.log("error submit")
+ return false
}
- });
+ })
},
// 鍒犻櫎
delClick() {},
@@ -330,14 +309,16 @@
if (valid) {
this.$router.push({
path: "/productManage/product",
- query: { categoryName:this.editConfig.infomation.name, id: this.editConfig.title === "鏂板缓"?'':this.editConfig.infomation.id},
- });
+ query: {
+ categoryName: this.editConfig.infomation.name,
+ id: this.editConfig.title === "鏂板缓" ? "" : this.editConfig.infomation.id
+ }
+ })
}
})
-
- },
- },
-};
+ }
+ }
+}
</script>
<!-- Add "scoped" attribute to limit CSS to this component only -->
@@ -365,15 +346,15 @@
height: calc(100% - 80px);
overflow: auto;
margin: 20px;
- border: 1px solid #dcdfe6;
- box-shadow: inset 0 0 2px #dee2e6;
- -moz-box-shadow: inset 0 0 2px #dee2e6;
- -webkit-box-shadow: inset 0 0 2px #dee2e6;
+ // border: 1px solid #dcdfe6;
+ // box-shadow: inset 0 0 2px #dee2e6;
+ // -moz-box-shadow: inset 0 0 2px #dee2e6;
+ // -webkit-box-shadow: inset 0 0 2px #dee2e6;
.content-number {
display: flex;
justify-content: right;
height: 44px;
- border-bottom: 1px solid #e9e9e9;
+ // border-bottom: 1px solid #e9e9e9;
font-size: 13px;
.sub-number {
width: 12.5%;
@@ -468,13 +449,18 @@
color: #333;
}
}
- .el-tabs--card > .el-tabs__header .el-tabs__nav {
- margin-left: 20px;
+ .el-tabs--card > .el-tabs__header {
+ border-bottom: none;
+ }
+ .el-tabs__item.is-active {
+ color: #fff;
+ background: #2a78fb;
}
.el-tabs__item {
height: 30px;
line-height: 30px;
font-size: 13px;
+ background: #f3f3f3;
}
}
</style>
--
Gitblit v1.8.0