From cf6a4b874aed82592eea78294715c7c688f9b248 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期五, 03 十一月 2023 14:50:31 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/add-token
---
src/views/productManage/product/AddProductDialog.vue | 791 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 506 insertions(+), 285 deletions(-)
diff --git a/src/views/productManage/product/AddProductDialog.vue b/src/views/productManage/product/AddProductDialog.vue
index b71c4a6..5c63af6 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="modalTitle + '浜у搧'"
:visible.sync="editConfig.visible"
:width="dialogWidth"
:before-close="handleClose"
>
<!-- 澶� -->
<div slot="title" class="dialog-header">
- <span>{{ editCommonConfig.title + "閲囪喘鍏ュ簱" }}</span>
+ <span>{{ modalTitle + "浜у搧" }}</span>
<div class="header_btns">
<span class="btn">
<i class="el-icon-printer"></i>
@@ -26,163 +26,167 @@
ref="form"
:model="editConfig.infomation"
:rules="rules"
- label-position="left"
+ label-position="right"
label-width="110px"
size="mini"
- style="height: 60vh; 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 @inOutBoundClick="inOutBoundClick" />
- <div class="basic-info-view">
- <el-row>
- <el-col :span="20">
- <div style="margin-left: 20px">浜у搧鍚嶇О</div>
- <el-form-item label="" prop="client_name" label-width="20px">
- <el-input
- v-model="editConfig.infomation.client_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; margin-top: -30px">
- <el-checkbox v-model="marketable" :disabled="!showFooter">鍙攢鍞�</el-checkbox>
- <el-checkbox v-model="procurable" :disabled="!showFooter">鍙噰璐�</el-checkbox>
- </div>
- </el-col>
- </el-row>
- </div>
+ <FormBtnsView
+ :add-product="addProduct"
+ @inOutBoundClick="inOutBoundClick"
+ @inLibraryClick="inLibraryClick"
+ :show-procure="showProcure"
+ :countObject="statisticsMap"
+ :show-sale="showSale"
+ @listingRulesClick="listingRulesClick"
+ @reorderRulesClick="reorderRulesClick"
+ />
<div class="bottom">
<el-tabs v-model="activeName" type="card">
<el-tab-pane label="鍩烘湰淇℃伅" name="first"></el-tab-pane>
- <el-tab-pane label="閲囪喘" name="second"></el-tab-pane>
+ <!-- <el-tab-pane label="閿�鍞�" name="sale"></el-tab-pane>
+ <el-tab-pane label="閲囪喘" name="second"></el-tab-pane> -->
<el-tab-pane label="搴撳瓨" name="third"></el-tab-pane>
- <el-tab-pane label="浼氳" name="four"></el-tab-pane>
+ <!-- <el-tab-pane label="浼氳" name="four"></el-tab-pane> -->
</el-tabs>
<!-- 鍩烘湰淇℃伅 -->
<div v-if="activeName === 'first'">
<div class="purchase-view">
<div class="left">
- <el-form-item label="浜у搧绫诲瀷" prop="client_name" 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.memberId"
+ v-model="editConfig.infomation.productType"
placeholder="璇烽�夋嫨"
size="mini"
style="width: 85%"
:disabled="!showFooter"
>
- <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
+ <el-option v-for="item in productTypeOptions" :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-form-item label="寮�绁ㄧ瓥鐣�" prop="invoicingStrategy" >
<el-select
- v-model="editConfig.infomation.memberId"
+ v-model="editConfig.infomation.invoicingStrategy"
placeholder="璇烽�夋嫨"
size="mini"
style="width: 85%"
:disabled="!showFooter"
>
- <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
+ <el-option v-for="item in strategyOptions" :key="item.id" :label="item.name" :value="item.id">
+ </el-option>
+ </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">
+ <el-select
+ v-model="editConfig.infomation.model"
+ placeholder="璇烽�夋嫨"
+ filterable
+ clearable
+ style="width: 85%"
+ :popper-append-to-body="false"
+ :disabled="!showFooter"
+ >
+ <el-option v-for="item in materialTypeList" :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"
- placeholder="璇烽�夋嫨"
- size="mini"
+ <el-form-item label="鍗曚綅" prop="unit">
+ <el-input
+ v-model="editConfig.infomation.unit"
+ placeholder="璇疯緭鍏�"
style="width: 85%"
:disabled="!showFooter"
- >
- <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
- </el-option>
- </el-select>
+ ></el-input>
</el-form-item>
- <el-form-item label="浜у搧鏍囩" prop="client_name" style="margin-left: 20px">
- <el-select
- v-model="editConfig.infomation.memberId"
- placeholder="璇烽�夋嫨"
- size="mini"
+ <el-form-item label="浜у搧鏍囩" prop="productTagName">
+ <el-input
+ v-model="editConfig.infomation.productTagName"
+ placeholder="璇疯緭鍏�"
style="width: 85%"
:disabled="!showFooter"
- >
- <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :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"
- placeholder="璇烽�夋嫨"
- size="mini"
- style="width: 85%"
- :disabled="!showFooter"
- >
- <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
- </el-option>
- </el-select>
+ ></el-input>
</el-form-item>
</div>
<div class="right">
- <el-form-item label="閿�鍞环鏍�" prop="name" style="margin-left: 20px">
- <span>锟�</span>
- <el-input
- v-model.trim="editConfig.infomation.name"
+ <el-form-item label="閿�鍞环鏍�" prop="salePrice">
+ <!-- <span>锟�</span> -->
+ <el-input-number
+ v-model.trim="editConfig.infomation.salePrice"
placeholder="璇疯緭鍏�"
+ :min="0"
+ :controls="false"
size="mini"
- style="width: 85%"
+ style="width: 81%"
:disabled="!showFooter"
- ></el-input>
+ ></el-input-number>
</el-form-item>
- <el-form-item label="閿�椤圭◣" prop="client_name" style="margin-left: 20px">
+ <!-- <el-form-item label="閿�椤圭◣" prop="customerTaxes" >
+ <el-input-number
+ v-model="editConfig.infomation.customerTaxes"
+ placeholder="璇疯緭鍏�"
+ :min="0"
+ :controls="false"
+ style="width: 85%; margin-right: 5px"
+ :disabled="!showFooter"
+ ></el-input-number>
+ </el-form-item> -->
+ <el-form-item label="鎴愭湰" prop="cost">
+ <!-- <span>锟�</span> -->
+ <el-input-number
+ v-model.trim="editConfig.infomation.cost"
+ placeholder="璇疯緭鍏�"
+ :min="0"
+ :controls="false"
+ size="mini"
+ style="width: 81%"
+ :disabled="!showFooter"
+ ></el-input-number>
+ </el-form-item>
+ <el-form-item label="浜у搧绫诲埆" prop="categoryId">
<el-select
- v-model="editConfig.infomation.memberId"
- multiple
+ v-model="editConfig.infomation.categoryId"
placeholder="璇烽�夋嫨"
size="mini"
style="width: 85%"
:disabled="!showFooter"
>
- <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
+ <el-option
+ v-for="item in productCategoryOptions"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id"
+ >
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="鎴愭湰" prop="name" style="margin-left: 20px">
- <span>锟�</span>
+ <el-form-item label="鍐呴儴缂栫爜" prop="internalReference">
<el-input
- v-model.trim="editConfig.infomation.name"
+ v-model.trim="editConfig.infomation.internalReference"
placeholder="璇疯緭鍏�"
size="mini"
style="width: 85%"
:disabled="!showFooter"
></el-input>
</el-form-item>
- <el-form-item label="鍐呴儴鍙傝��" prop="name" style="margin-left: 20px">
+ <el-form-item label="鏉＄爜" prop="barcode">
<el-input
- v-model.trim="editConfig.infomation.name"
- placeholder="璇疯緭鍏�"
- size="mini"
- style="width: 85%"
- :disabled="!showFooter"
- ></el-input>
- </el-form-item>
- <el-form-item label="鏉＄爜" prop="name" style="margin-left: 20px">
- <el-input
- v-model.trim="editConfig.infomation.name"
+ v-model.trim="editConfig.infomation.barcode"
placeholder="璇疯緭鍏�"
size="mini"
style="width: 85%"
@@ -192,22 +196,204 @@
</div>
</div>
<div class="all">
- <div class="second-label">鍐呴儴璇存槑</div>
- <el-form-item label="" prop="name" 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.desc"
+ v-model.trim="editConfig.infomation.internalNotes"
placeholder="璇疯緭鍏�"
size="mini"
type="textarea"
- style="width: 100%"
+ style="width: 95%"
:autosize="{ minRows: 4 }"
:disabled="!showFooter"
></el-input>
</el-form-item>
</div>
</div>
+ <!-- 搴撳瓨 -->
+ <div v-if="activeName === 'third'">
+ <div class="purchase-view">
+ <div class="all">
+ <div class="second-label">鐗╂祦</div>
+ </div>
+ </div>
+ <div class="purchase-view">
+ <!-- <div class="left">
+ <div class="second-label">鎿嶄綔</div>
+ <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
+ }}</el-checkbox>
+ </el-checkbox-group>
+ </el-form-item>
+ </div> -->
+ <div class="left">
+ <el-form-item label="璐熻矗浜�" prop="principal" label-width="80px">
+ <el-select
+ v-model="editConfig.infomation.principal"
+ placeholder="璇烽�夋嫨"
+ size="mini"
+ style="width: 85%"
+ :disabled="!showFooter"
+ >
+ <el-option v-for="item in memberOptions" :key="item.id" :label="item.name" :value="item.name">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="閲嶉噺" prop="weight" label-width="80px">
+ <el-input-number
+ v-model="editConfig.infomation.weight"
+ placeholder="璇疯緭鍏�"
+ :min="0"
+ :precision="2"
+ :controls="false"
+ style="width: 85%"
+ :disabled="!showFooter"
+ ></el-input-number>
+ <span> kg</span>
+ </el-form-item>
+ <el-form-item label="浣撶Н" prop="volume" label-width="80px">
+ <el-input-number
+ v-model="editConfig.infomation.volume"
+ placeholder="璇疯緭鍏�"
+ :min="0"
+ :precision="2"
+ :controls="false"
+ style="width: 85%"
+ :disabled="!showFooter"
+ ></el-input-number>
+ <span> m鲁</span>
+ </el-form-item>
+ </div>
+ <div class="right">
+ <el-form-item label="鍒堕�犲墠缃椂闂�" prop="makeAdvanceTime" label-width="130px">
+ <el-input-number
+ v-model="editConfig.infomation.makeAdvanceTime"
+ placeholder="璇疯緭鍏�"
+ :min="0"
+ :precision="0"
+ :controls="false"
+ style="width: 85%"
+ :disabled="!showFooter"
+ ></el-input-number>
+ <span> 澶╂暟</span>
+ </el-form-item>
+ <el-form-item label="鐢熶骇璁㈠崟鍑嗗澶╂暟" prop="orderAdvanceTime" label-width="130px">
+ <el-input-number
+ v-model="editConfig.infomation.orderAdvanceTime"
+ placeholder="璇疯緭鍏�"
+ :min="0"
+ :precision="0"
+ :controls="false"
+ style="width: 85%"
+ :disabled="!showFooter"
+ ></el-input-number>
+ <span> 澶╂暟</span>
+ </el-form-item>
+ <el-form-item label="瀹㈡埛鍓嶇疆鏃堕棿" prop="deliveryAdvanceTime" label-width="130px">
+ <el-input-number
+ v-model="editConfig.infomation.deliveryAdvanceTime"
+ placeholder="璇疯緭鍏�"
+ :min="0"
+ :precision="0"
+ :controls="false"
+ style="width: 85%"
+ :disabled="!showFooter"
+ ></el-input-number>
+ <span> 澶�</span>
+ </el-form-item>
+ </div>
+ </div>
+ <!-- <div class="purchase-view">
+ <div class="left">
+ <div class="second-label">鏀惰揣璇存槑</div>
+ <el-form-item label="" prop="inStorageExplain" label-width="0px">
+ <el-input
+ v-model.trim="editConfig.infomation.inStorageExplain"
+ placeholder="姝よ鏄庢坊鍔犲埌鏀惰揣璁㈠崟涓�(渚嬪锛屼骇鍝佸湪浠撳簱鐨勫瓨鍌ㄤ綅缃�)"
+ size="mini"
+ type="textarea"
+ style="width: 95%"
+ :autosize="{ minRows: 4 }"
+ :disabled="!showFooter"
+ ></el-input>
+ </el-form-item>
+ </div>
+ <div class="right">
+ <div class="second-label">鍑哄簱鍗曡鏄�</div>
+ <el-form-item label="" prop="outStorageExplain" label-width="0px">
+ <el-input
+ v-model.trim="editConfig.infomation.outStorageExplain"
+ placeholder="姝ら�氱煡宸叉坊鍔犲埌閫佽揣鍗曚腑"
+ size="mini"
+ type="textarea"
+ style="width: 95%"
+ :autosize="{ minRows: 4 }"
+ :disabled="!showFooter"
+ ></el-input>
+ </el-form-item>
+ </div>
+ </div>
+ <div class="purchase-view">
+ <div class="left">
+ <div class="second-label">鍐呴儴璋冩嫧璇存槑</div>
+ <el-form-item label="" prop="internalTransferExplain" label-width="0px">
+ <el-input
+ v-model.trim="editConfig.infomation.internalTransferExplain"
+ placeholder="姝よ鏄庢坊鍔犲埌鍐呴儴璋冩嫧璁㈠崟涓�(渚嬪锛屽湪浠撳簱涓綍澶勬彁鍙栦骇鍝�)"
+ size="mini"
+ type="textarea"
+ style="width: 100%"
+ :autosize="{ minRows: 4 }"
+ :disabled="!showFooter"
+ ></el-input>
+ </el-form-item>
+ </div>
+ <div class="right"></div>
+ </div> -->
+ </div>
+ <!-- 涓嬮潰涓嶈鍒� 浜屾湡鎴栦笁鏈熶細鐢ㄥ埌 -->
+ <!-- 閿�鍞� -->
+ <!-- <div v-if="activeName === 'sale'">
+ <div class="purchase-view">
+ <div class="left">
+ <div class="second-label">{{ "鍔犲敭&浜ゅ弶閿�鍞�" }}</div>
+ <el-form-item label="鍙�変骇鍝�" prop="selectProduct" >
+ <el-select
+ v-model="editConfig.infomation.selectProduct"
+ multiple
+ placeholder="璇烽�夋嫨"
+ size="mini"
+ style="width: 85%"
+ :disabled="!showFooter"
+ >
+ <el-option
+ v-for="item in selectProductOptions"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <div class="second-label">閿�鍞鏄�</div>
+ <el-form-item label="" prop="sellExplain" label-width="20px">
+ <el-input
+ v-model.trim="editConfig.infomation.sellExplain"
+ size="mini"
+ type="textarea"
+ style="width: 85%"
+ :autosize="{ minRows: 2 }"
+ :disabled="!showFooter"
+ ></el-input>
+ </el-form-item>
+ </div>
+ <div class="right"></div>
+ </div>
+ </div> -->
<!-- 閲囪喘 -->
- <div v-if="activeName === 'second'">
+ <!-- <div v-if="activeName === 'second'">
<CommonFormTableView
:product-table-list="productTableList"
:detail-enter="!showFooter"
@@ -227,7 +413,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
@@ -240,7 +426,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>
@@ -249,7 +435,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="鏈潯澶囨敞琚坊鍔犲埌閲囪喘璁㈠崟"
@@ -262,144 +448,13 @@
</el-form-item>
</div>
</div>
- </div>
- <!-- 搴撳瓨 -->
- <div v-if="activeName === 'third'">
- <div class="purchase-view">
- <div class="left">
- <div class="second-label">浣滀笟</div>
- <el-form-item label="璺嚎" prop="checkedCities" style="margin-left: 20px">
- <el-checkbox-group v-model="checkedCities" :min="1" :max="2">
- <el-checkbox v-for="city in cities" :label="city" :key="city" class="list-item">{{
- city.length > 20 ? city.substring(0, 20) + "..." : city
- }}</el-checkbox>
- </el-checkbox-group>
- </el-form-item>
- </div>
- <div class="right">
- <div class="second-label">鐗╂祦</div>
- <el-form-item label="璐熻矗浜�" prop="name" style="margin-left: 20px">
- <el-select
- v-model="editConfig.infomation.memberId"
- multiple
- placeholder="璇烽�夋嫨"
- size="mini"
- style="width: 85%"
- :disabled="!showFooter"
- >
- <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="閲嶉噺" prop="client_name" style="margin-left: 20px">
- <el-input
- v-model.trim="editConfig.infomation.name"
- placeholder="璇疯緭鍏�"
- size="mini"
- style="width: 85%"
- :disabled="!showFooter"
- ></el-input>
- <span> kg</span>
- </el-form-item>
- <el-form-item label="浣撶Н" prop="client_name" style="margin-left: 20px">
- <el-input
- v-model.trim="editConfig.infomation.name"
- placeholder="璇疯緭鍏�"
- size="mini"
- style="width: 85%"
- :disabled="!showFooter"
- ></el-input>
- <span> m鲁</span>
- </el-form-item>
- <el-form-item label="瀹㈡埛鍓嶇疆鏃堕棿" prop="client_name" style="margin-left: 20px">
- <el-input
- v-model.trim="editConfig.infomation.name"
- placeholder="璇疯緭鍏�"
- size="mini"
- style="width: 85%"
- :disabled="!showFooter"
- ></el-input>
- <span> 澶�</span>
- </el-form-item>
- <el-form-item label="HS缂栫爜" prop="name" style="margin-left: 20px">
- <el-input
- v-model.trim="editConfig.infomation.name"
- placeholder="璇疯緭鍏�"
- size="mini"
- style="width: 85%"
- :disabled="!showFooter"
- ></el-input>
- </el-form-item>
- <el-form-item label="璐х墿鍘熶骇鍦�" prop="name" style="margin-left: 20px">
- <el-select
- v-model="editConfig.infomation.memberId"
- multiple
- placeholder="璇烽�夋嫨"
- size="mini"
- style="width: 85%"
- :disabled="!showFooter"
- >
- <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
- </div>
- </div>
- <div class="purchase-view">
- <div class="left">
- <div class="second-label">鏀惰揣璇存槑</div>
- <el-form-item label="" prop="name" style="margin-left: 20px" label-width="0px">
- <el-input
- v-model.trim="editConfig.infomation.desc"
- placeholder="姝よ鏄庢坊鍔犲埌鏀惰揣璁㈠崟涓�"
- size="mini"
- type="textarea"
- style="width: 100%"
- :autosize="{ minRows: 4 }"
- :disabled="!showFooter"
- ></el-input>
- </el-form-item>
- </div>
- <div class="right">
- <div class="second-label">鍑哄簱鍗曡鏄�</div>
- <el-form-item label="" prop="name" style="margin-left: 20px" label-width="0px">
- <el-input
- v-model.trim="editConfig.infomation.desc"
- placeholder="璇疯緭鍏�"
- size="mini"
- type="textarea"
- style="width: 100%"
- :autosize="{ minRows: 4 }"
- :disabled="!showFooter"
- ></el-input>
- </el-form-item>
- </div>
- </div>
- <div class="purchase-view">
- <div class="left">
- <div class="second-label">鍐呴儴璋冩嫧璇存槑</div>
- <el-form-item label="" prop="name" style="margin-left: 20px" label-width="0px">
- <el-input
- v-model.trim="editConfig.infomation.desc"
- placeholder="璇疯緭鍏�"
- size="mini"
- type="textarea"
- style="width: 100%"
- :autosize="{ minRows: 4 }"
- :disabled="!showFooter"
- ></el-input>
- </el-form-item>
- </div>
- <div class="right"></div>
- </div>
- </div>
+ </div> -->
</div>
</div>
</el-form>
<!-- 灏� -->
- <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>
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" size="small" @click="saveClick('form')" :disabled="!showFooter">淇濆瓨</el-button>
<el-button size="small" @click="editConfig.visible = false">鍙栨秷</el-button>
</div>
</el-dialog>
@@ -407,7 +462,9 @@
</template>
<script>
-import CommonFormTableView from "@/components/makepager/CommonFormTableView"
+// import CommonFormTableView from "@/components/makepager/CommonFormTableView"
+import { getProductCategoryList } from "@/api/product/productCategory"
+import { getProductList, addProduct, updateProduct } from "@/api/product/product"
let inputElement = null
export default {
@@ -419,36 +476,50 @@
return {
visible: false,
title: "鏂板缓",
- infomation: { type: [] }
+ infomation: {},
+ autoEdit: false
}
}
}
},
- components: { CommonFormTableView },
- computed: {},
+ components: {},
+ computed: {
+ modalTitle() {
+ if (this.editConfig.title === "缂栬緫" && this.editConfig.autoEdit) {
+ return "缂栬緫"
+ } else if (this.editConfig.title === "缂栬緫") {
+ return !this.showEdit ? "缂栬緫" : "鏌ョ湅"
+ } else {
+ return "鏂板缓"
+ }
+ }
+ },
data() {
return {
dialogWidth: "50%",
editConfig: this.editCommonConfig,
rules: {
- client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: "change" }],
- number: [{ required: true, message: "璇疯緭鍏ラ��娆惧崟缂栧彿", trigger: "blur" }],
- refundDate: [{ required: true, message: "璇烽�夋嫨閫�娆炬棩鏈�", trigger: "change" }],
- memberId: [{ required: true, message: "璇烽�夋嫨閿�鍞礋璐ｄ汉", trigger: "change" }],
- sale_return_nunber: [{ required: true, message: "璇烽�夋嫨閿�鍞��璐у崟", trigger: "change" }]
+ name: [{ required: true, message: "璇疯緭鍏ヤ骇鍝佸悕绉�", trigger: "blur" }],
+ model: [{ required: true, message: "璇烽�夋嫨鐗╂枡绫诲瀷", trigger: "change" }],
+ // salePrice: [{ required: true, message: "璇疯緭鍏ラ攢鍞环鏍�", trigger: "blur" }],
+ unit: [{ required: true, message: "璇疯緭鍏ュ崟浣�", trigger: "blur" }]
},
- memberOptions: [],
- paymentTypeListOptions: [],
- numberList: [
- { label: "鑽夌", status: "todo" },
- { label: "姝ｅ湪绛夊緟", status: "todo" },
- { label: "灏辩华", status: "todo" },
- { label: "瀹屾垚", status: "todo" }
- ],
+ memberOptions: [{ name: "绠＄悊鍛�", id: 1 }],
+ productCategoryOptions: [], // 浜у搧绫诲埆
+ productTypeOptions: [
+ { name: "鑳芥秷鑰�", id: 1 },
+ { name: "鏈嶅姟", id: 2 },
+ { name: "鍙簱瀛樹骇鍝�", id: 3 }
+ ], // 浜у搧绫诲瀷
+ strategyOptions: [
+ { name: "璁㈣喘鏁伴噺", id: 1 },
+ { name: "浜や粯鏁伴噺", id: 2 }
+ ], // 寮�绁ㄧ瓥鐣�
+ selectProductOptions: [], // 鍙�変骇鍝�
showButton: true,
activeName: "first",
productTableList: {},
- tableData: [{ name: "ssss" }],
+ tableData: [],
isNoProduct: false, // 娣诲姞鏄庣粏琛屾椂鏄惁鏈変骇鍝佹湭閫夋嫨
showEdit: false, // 鏄惁鏄剧ず缂栬緫鎸夐挳
isDelClick: false, // 鍒犻櫎鎸夐挳鏄惁鍙偣鍑�
@@ -456,24 +527,99 @@
imageSrc: "", // 鍥剧墖鍦板潃
marketable: true, // 鍙攢鍞�
procurable: true, // 鍙噰璐�
- checkedCities: ["涓婃捣", "鍖椾含"],
- cities: ["涓婃捣瀵瑰瀵瑰瀵瑰澶氬澶氬澶氬澶氬寳浜瀵瑰瀵瑰瀵�", "鍖椾含瀵瑰瀵瑰瀵瑰澶�", "骞垮窞", "娣卞湷"]
+ checkedRoute: [],
+ route: ["鍒堕��", "娌虫睜鐢熶骇鍒堕�犱粨"],
+ addProduct: false,
+ showProcure: true,
+ showSale: true,
+ materialTypeList: [
+ { name: "鍘熸潗鏂�", id: "鍘熸潗鏂�" },
+ { name: "鍗婃垚鍝�", id: "鍗婃垚鍝�" },
+ { name: "鎴愬搧", id: "鎴愬搧" },
+ { name: "杈呮枡", id: "杈呮枡" },
+ { name: "鑰楁潗", id: "鑰楁潗" },
+ { name: "鍏朵粬", id: "鍏朵粬" }
+ ],
+ statisticsMap: {
+ inLibrary: 0 // 鍦ㄥ簱
+ }
}
},
created() {
+ this.getProductCategoryList()
+ this.getProductList()
this.setTableForm()
this.setBottonView()
+ this.statisticsMap.inLibrary = this.editConfig?.infomation?.amount ?? 0
+ if (this.editConfig.autoEdit) {
+ this.editClick()
+ }
+ this.setOptionalFieldsToEmpty()
},
methods: {
+ /**
+ * 闈炲繀濉」鍚庣杩斿洖鐨勬槸鏁板瓧 0,琛ㄥ崟闇�瑕佺┖涓叉墠鑳借涓烘湭閫夋嫨鍥炴樉
+ */
+ setOptionalFieldsToEmpty() {
+ let arr = ["productType", "categoryId"]
+ arr
+ .filter((filed) => this.editConfig.infomation[filed] === 0)
+ .forEach((filed) => {
+ this.editConfig.infomation[filed] = ""
+ })
+ },
+ /**
+ * 鍚庣鍙帴鍙楁暟瀛楀舰寮�, 淇濆瓨鏃惰繕寰楀啀杞洖鍘�
+ */
+ unsetFieldsToNumber() {
+ let arr = ["productType", "categoryId"]
+ arr
+ .filter((filed) => this.editConfig.infomation[filed] === "")
+ .forEach((filed) => {
+ this.editConfig.infomation[filed] = 0
+ })
+ },
+ // 鑾峰彇浜у搧绫诲埆
+ async getProductCategoryList() {
+ await getProductCategoryList({
+ keyWord: "",
+ page: 0,
+ pageSize: 0
+ }).then((res) => {
+ if (res.code === 200) {
+ this.productCategoryOptions = res.data
+ }
+ })
+ },
+ // 鑾峰彇鍙�変骇鍝�
+ async getProductList() {
+ await getProductList({
+ keyWord: "",
+ page: 1,
+ pageSize: 20
+ }).then((res) => {
+ if (res.code === 200) {
+ const list = res.data.map((item) => {
+ return {
+ id: item.id,
+ name: item.name
+ }
+ })
+ this.selectProductOptions = list || []
+ }
+ })
+ },
// 璁剧疆鍒犻櫎/鎵撳嵃/缂栬緫鏄惁鏄剧ず
setBottonView() {
if (this.editConfig.title === "鏂板缓") {
this.showButton = false
this.showEdit = false
this.showFooter = true
+ this.addProduct = true
} else {
this.showEdit = true
this.showFooter = false
+ this.addProduct = false
}
},
// 鍏抽棴
@@ -488,7 +634,25 @@
this.setTableForm()
},
// 淇濆瓨
- saveClick() {},
+ saveClick(formName) {
+ console.log(this.editConfig.infomation)
+ this.$refs[formName].validate((valid) => {
+ if (valid) {
+ let requestUrl = this.editConfig.title === "鏂板缓" ? addProduct : updateProduct
+ this.unsetFieldsToNumber()
+ requestUrl({
+ ...this.editConfig.infomation
+ }).then((res) => {
+ console.log(res)
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ this.$message.success("娣诲姞鎴愬姛")
+ this.$parent.getData()
+ }
+ }, console.error)
+ }
+ })
+ },
// 鍒犻櫎
delClick() {},
setTableForm() {
@@ -595,7 +759,65 @@
},
// 杩涘嚭鐐瑰嚮
inOutBoundClick() {
- this.$router.push({ path: "/reportForm/inOutboundDetail", query: { name: "浜у搧鍚嶇О/鍑哄叆搴撴槑缁�" } })
+ if (this.editConfig.title !== "鏂板缓") {
+ console.log(this.editConfig.infomation)
+ this.$router.push({
+ name: "inboundOutboundDetail",
+ params: {
+ name: this.editConfig.infomation.name,
+ id: this.editConfig.infomation.id
+ }
+ })
+ }
+ },
+ // 鍦ㄥ簱鐐瑰嚮
+ inLibraryClick() {
+ if (this.editConfig.title !== "鏂板缓") {
+ console.log(this.editConfig.infomation)
+ this.$router.push({
+ name: "inventoryReport",
+ params: {
+ name: this.editConfig.infomation.name,
+ id: this.editConfig.infomation.id
+ }
+ })
+ }
+ },
+ // 涓婃灦瑙勫垯
+ listingRulesClick() {
+ this.$refs.form.validate((valid) => {
+ if (valid) {
+ this.$router.push({
+ path: "/warehouseManage/listingRules",
+ query: {
+ productName: this.editConfig.infomation.name,
+ productId: this.editConfig.title === "鏂板缓" ? "" : this.editConfig.infomation.id
+ }
+ })
+ }
+ })
+ },
+ // 閲嶈璐鍒�
+ reorderRulesClick() {
+ this.$refs.form.validate((valid) => {
+ if (valid) {
+ this.$router.push({
+ path: "/productManage/reorderRules",
+ query: {
+ productName: this.editConfig.infomation.name,
+ productId: this.editConfig.title === "鏂板缓" ? "" : this.editConfig.infomation.id
+ }
+ })
+ }
+ })
+ },
+ // 鍙攢鍞�/鍙噰璐�
+ checkboxChange(val, param) {
+ if (val === "閲囪喘") {
+ this.showProcure = param
+ } else if (val === "閿�鍞�") {
+ this.showSale = param
+ }
}
}
}
@@ -625,16 +847,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%;
@@ -661,22 +886,6 @@
}
}
}
- .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%;
- }
- }
- }
.purchase-view {
display: flex;
.left {
@@ -685,14 +894,18 @@
.right {
width: 50%;
}
+ .all {
+ width: 100%;
+ }
}
.second-label {
margin-left: 20px;
+ margin-right: 20px;
border-bottom: 1px solid #d9d9d9;
margin-bottom: 10px;
}
.list-item {
- width: 300px;
+ width: 100%;
}
.avatar-uploader .el-upload {
border: 1px dashed #d9d9d9;
@@ -729,13 +942,21 @@
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;
}
}
</style>
--
Gitblit v1.8.0