From 0fe07c82aaf1d81511e524647cf2bc473b5ec298 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 25 十月 2023 17:37:27 +0800
Subject: [PATCH] Merge branch 'zhengwenfeng/modify-style' into dev
---
vue.config.js | 6
.env.preview | 12 +
.env | 18 +
src/components/makepager/CommonFormTableView.vue | 50 ++++
src/views/sales/salesDetails/AddSalesDetailsDialog.vue | 276 ++++++++++++++-----------
src/views/sales/salesReturn/AddSalesReturnDialog.vue | 212 ++++++++----------
.env.development | 8
src/views/sales/salesReturn/index.vue | 5
src/views/sales/quotation/AddQuotationDialog.vue | 2
package.json | 4
src/api/data.js | 17 +
src/views/sales/contractManage/AddContractManageDialog.vue | 15 +
src/views/sales/salesDetails/index.vue | 14
13 files changed, 385 insertions(+), 254 deletions(-)
diff --git a/.env b/.env
new file mode 100644
index 0000000..101017f
--- /dev/null
+++ b/.env
@@ -0,0 +1,18 @@
+# 鎵�鏈夌幆澧冮粯璁�
+
+# 椤甸潰 title 鍓嶇紑
+VUE_APP_TITLE=Basic
+NODE_ENV=development
+VUE_APP_BATH_PATH='http://192.168.20.119:9083'
+# 缃戠粶璇锋眰鍏敤鍦板潃
+VUE_APP_API=/api/
+
+# 浠撳簱鍦板潃
+VUE_APP_REPO=""
+
+# 鍥介檯鍖栭厤缃�
+VUE_APP_I18N_LOCALE=zh-chs
+VUE_APP_I18N_FALLBACK_LOCALE=en
+
+# element 棰滆壊
+VUE_APP_ELEMENT_COLOR=#2A78FB
diff --git a/.env.development b/.env.development
new file mode 100644
index 0000000..9073ccc
--- /dev/null
+++ b/.env.development
@@ -0,0 +1,8 @@
+# 寮�鍙戠幆澧�
+# 鎸囧畾鏋勫缓妯″紡
+NODE_ENV=development
+
+# 椤甸潰 title 鍓嶇紑
+VUE_APP_TITLE=Basic
+VUE_APP_BATH_PATH='http://192.168.20.119:9083'
+
diff --git a/.env.preview b/.env.preview
new file mode 100644
index 0000000..99ff596
--- /dev/null
+++ b/.env.preview
@@ -0,0 +1,12 @@
+# 鏋勫缓棰勮椤甸潰
+
+# 鎸囧畾鏋勫缓妯″紡
+NODE_ENV=production
+
+# 鏍囪褰撳墠鏋勫缓鏂瑰紡
+VUE_APP_BUILD_MODE=PREVIEW
+VUE_APP_BATH_PATH='http://www.fai365.com:9081
+VUE_APP_SCOURCE_LINK=TRUE
+
+# 閮ㄧ讲璺緞
+VUE_APP_PUBLIC_PATH=/
diff --git a/package.json b/package.json
index 7eb0c2b..1925ac5 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,9 @@
"scripts": {
"serve": "vue-cli-service serve",
"build": "vue-cli-service build",
- "lint": "vue-cli-service lint"
+ "lint": "vue-cli-service lint",
+ "build:preview": "NODE_OPTIONS=--max_old_space_size=4096 vue-cli-service build --mode preview",
+ "test:unit": "vue-cli-service test:unit"
},
"dependencies": {
"axios": "^1.4.0",
diff --git a/src/api/data.js b/src/api/data.js
new file mode 100644
index 0000000..994fab4
--- /dev/null
+++ b/src/api/data.js
@@ -0,0 +1,17 @@
+// 閿�鍞槑缁� 浜や粯绫诲瀷
+const deliveryType = [
+ {
+ name: "涓�娆″彂璐�",
+ id: 1
+ },
+ {
+ name: "澶氭鍙戣揣",
+ id: 2
+ }
+]
+
+export const getDataByType = (type) => {
+ if (type == "deliveryType") {
+ return deliveryType
+ }
+}
diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index fbdc6fe..b8e1f51 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -2,12 +2,17 @@
<div class="page-view">
<el-form ref="form" :model="tableList" :show-message="false" label-position="right">
<el-table
+ ref="fromTable"
:data="tableList.tableData"
:show-summary="showSummary.show"
:summary-method="getSummaries"
:span-method="arraySpanMethod"
style="width: 100%"
+ @selection-change="handleSelectionChange"
+ :row-key="(row) => row.productId"
>
+ <el-table-column v-if="selectBox" type="selection" :reserve-selection="true" width="40" align="center">
+ </el-table-column>
<el-table-column v-if="tableList.isReturn" type="index" label="#" width="50" align="center"></el-table-column>
<el-table-column
v-for="(item, i) in tableList.tableColumn"
@@ -125,9 +130,30 @@
</el-form-item>
<span v-else>{{ scope.row[item.prop] }}</span>
</template>
+ <el-form-item
+ v-else-if="item.inputNumber && selectBox"
+ label=" "
+ :prop="'tableData.' + scope.$index + '.' + item.prop"
+ :rules="[{ required: item.isRequird ? true : false, message: '杈撳叆涓嶈兘涓虹┖' }]"
+ >
+ <el-input-number
+ v-model="scope.row[item.prop]"
+ placeholder=""
+ :min="0"
+ :controls="false"
+ size="mini"
+ style="width: 100%; margin-right: 5px"
+ @change="
+ (val) => {
+ commonInputChange(val, item.prop, scope.row)
+ }
+ "
+ ></el-input-number>
+ </el-form-item>
<span v-else style="text-align: right">{{ scope.row[item.prop] }}</span>
</template>
</el-table-column>
+ <slot name="tableButton" />
</el-table>
</el-form>
<div v-if="!detailEnter" style="margin: 10px">
@@ -138,7 +164,7 @@
>閲嶇畻</el-button
>
</div>
- <div v-if="false && (showSummary.total || showSummary.refundable)" style="height: 42px; line-height: 42px" >
+ <div v-if="false && (showSummary.total || showSummary.refundable)" style="height: 42px; line-height: 42px">
<el-row :gutter="10">
<el-col v-if="showSummary.total" :span="3" :offset="21">
<span style="font-weight: bold">鍚堣</span>
@@ -167,6 +193,10 @@
components: { SelectCommonDialog },
props: {
detailEnter: {
+ type: Boolean,
+ default: false
+ },
+ selectBox: {
type: Boolean,
default: false
},
@@ -211,7 +241,9 @@
}
},
created() {
- this.getProductList()
+ if (!this.selectBox) {
+ this.getProductList()
+ }
this.tableList = this.productTableList
if (this.tableList.tableData.length === 1 && this.tableList.tableData[0].name === "") {
this.isRecalculate = false
@@ -229,7 +261,7 @@
page: 1,
pageSize: 5
}).then((res) => {
- console.log(res,"浜у搧鍚嶇О")
+ console.log(res, "浜у搧鍚嶇О")
if (res.code === 200) {
if (res.data.data && res.data.data.length > 0) {
this.productList = res.data.data
@@ -240,6 +272,7 @@
handleReserve(row) {
return row._id ? row._id : row.id
},
+ // 澶氶��
handleSelectionChange(val) {
this.$emit("getSelectArray", val)
},
@@ -420,6 +453,17 @@
})
this.$emit("clearupProduct", this.tableList.tableData)
}
+ // 澶氶�夎缃凡閫変腑
+ // toggleSelection(rows) {
+ // console.log("88888888888888888888888888888888888888888")
+ // console.log(rows)
+ // if (rows) {
+ // rows.forEach((row) => {
+ // this.$refs.fromTable.toggleRowSelection(row, true)
+ // console.log(row)
+ // })
+ // }
+ // }
}
}
</script>
diff --git a/src/views/sales/contractManage/AddContractManageDialog.vue b/src/views/sales/contractManage/AddContractManageDialog.vue
index 6534914..48b91c8 100644
--- a/src/views/sales/contractManage/AddContractManageDialog.vue
+++ b/src/views/sales/contractManage/AddContractManageDialog.vue
@@ -148,6 +148,18 @@
</div>
</el-form-item>
</el-col>
+ <el-col :span="12">
+ <el-form-item label="鍙戣揣鏃ユ湡" prop="deliveryDate">
+ <el-date-picker
+ v-model="editConfig.infomation.deliveryDate"
+ value-format="yyyy-MM-dd"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡"
+ style="width: 100%"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
</el-row>
</div>
<!-- 闄勪欢淇℃伅 -->
@@ -284,7 +296,8 @@
number: [{ required: true, validator: this.validateCheckCode, trigger: ["blur",'change'] }],
client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: "change" }],
member_id: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- contractName: [{ required: true, message: "璇疯緭鍏ュ悎鍚屽悕绉�", trigger: "blur" }]
+ contractName: [{ required: true, message: "璇疯緭鍏ュ悎鍚屽悕绉�", trigger: "blur" }],
+ quotation_number: [{ required: true, message: "璇烽�夋嫨閿�鍞姤浠峰崟", trigger: "change" }]
},
memberOptions: [],
statusOptions: [], // 鍚堝悓鐘舵��
diff --git a/src/views/sales/quotation/AddQuotationDialog.vue b/src/views/sales/quotation/AddQuotationDialog.vue
index b9de06b..f09c5f7 100644
--- a/src/views/sales/quotation/AddQuotationDialog.vue
+++ b/src/views/sales/quotation/AddQuotationDialog.vue
@@ -673,7 +673,7 @@
this.tableData = data
this.productTableList.tableData = this.tableData
},
- // 璁㈠崟缂栫爜鍗曠嫭鏍￠獙
+ // 閿�鍞満浼氬崟鐙牎楠�
checkChance(rule, value, callback) {
if (this.editConfig.infomation.sale_chance_name && this.editConfig.infomation.sale_chance_name.length > 0) {
callback()
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index 33587d1..d4806a9 100644
--- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
+++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -28,16 +28,14 @@
<el-input
v-if="
editConfig.title == '缂栬緫' ||
- (editConfig.title == '鏂板缓' &&
- codenumer &&
- (explain != '' || isIdDisabled))
+ (editConfig.title == '鏂板缓' && codenumer && (explain != '' || isIdDisabled))
"
:disabled="editConfig.title == '缂栬緫'"
v-model="editConfig.infomation.number"
placeholder="璇疯緭鍏ョ紪鐮�"
>
</el-input>
- <span v-else-if="editConfig.title == '鏂板缓'" style="color: #f56c6c"
+ <span v-else-if="editConfig.title == '鏂板缓'" style="color: #f56c6c"
>璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span
>
<!-- <WordInput
@@ -88,7 +86,7 @@
</el-col>
<el-col :span="12">
- <el-form-item label="閿�鍞満浼�" prop="saleChanceId">
+ <el-form-item label="閿�鍞満浼�" prop="sale_chance_name">
<div class="custom-name">
<el-autocomplete
style="width: 100%"
@@ -151,19 +149,39 @@
</div>
</el-form-item>
</el-col>
- <!-- <el-col :span="12">
- <el-form-item label="閫夋嫨婧愬崟" prop="selSourceOrder">
- <el-select v-model="editConfig.infomation.selSourceOrder" size="mini" style="width: 63%">
- <el-option
- v-for="item in selSourceOrderOptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
+ <el-col :span="12">
+ <el-form-item label="閿�鍞姤浠峰崟" prop="quotation_number">
+ <div class="custom-name">
+ <el-autocomplete
+ v-model="editConfig.infomation.quotation_number"
+ :fetch-suggestions="
+ (queryString, callback) => {
+ querySearchAsync(queryString, callback, 'quotation')
+ }
+ "
+ value-key="number"
+ @select="handleSelectClient('quotation', $event)"
+ style="width: 100%"
+ placeholder="璇峰厛閫夋嫨閿�鍞満浼�"
+ :disabled="isAddQuatation"
+ ></el-autocomplete>
+ <div v-if="!isAddQuatation" class="common-select-btn" @click="selClientClick('quotation')">
+ <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
+ </div>
+ <div
+ v-if="
+ editConfig.infomation.quotation_number &&
+ editConfig.infomation.quotation_number.length > 0 &&
+ !isAddQuatation
+ "
+ class="common-select-btn"
+ @click="clearupClient('quotation')"
>
- </el-option>
- </el-select>
+ <i class="el-icon-remove-outline" title="娓呴櫎"></i>
+ </div>
+ </div>
</el-form-item>
- </el-col> -->
+ </el-col>
<el-col :span="12">
<el-form-item label="绛剧害鏃ユ湡" prop="signTime">
<el-date-picker
@@ -201,29 +219,19 @@
</el-date-picker>
</el-form-item>
</el-col>
- <!-- <el-col :span="12">
- <el-form-item label="寰俊璁㈠崟鐘舵��" prop="wechatOrderStatus">
- <div class="common-select">
- <el-select
- v-model="editConfig.infomation.wechatOrderStatus"
- placeholder="璇烽�夋嫨"
- class="common-select-sel"
- size="mini"
- >
- <el-option
- v-for="item in wechatOrderStatusOptions"
- :key="item.id"
- :label="item.name"
- :value="item.id"
- >
- </el-option>
- </el-select>
- <div class="common-select-btn">
- <i class="el-icon-setting"></i>
- </div>
- </div>
+ <el-col :span="12">
+ <el-form-item label="浜や粯绫诲瀷" prop="deliverType">
+ <el-select
+ v-model="editConfig.infomation.deliverType"
+ placeholder="璇烽�夋嫨"
+ size="mini"
+ style="width: 100%"
+ >
+ <el-option v-for="item in deliveryTypeList" :key="item.id" :label="item.name" :value="item.id">
+ </el-option>
+ </el-select>
</el-form-item>
- </el-col> -->
+ </el-col>
</el-row>
</div>
<!-- 鏀惰揣淇℃伅 -->
@@ -345,14 +353,14 @@
</div>
<div class="product-view">
<CommonFormTableView
+ ref="commonFormTableView"
+ :detail-enter="true"
+ :select-box="true"
:show-summary="showSummary"
:product-table-list="productTableList"
@inputContent="inputContent"
- @addProductClick="addProductClick"
- @emptyProductClick="emptyProductClick"
- @recalculateProductClick="recalculateProductClick"
- @clearupProduct="clearupProduct"
- />
+ @getSelectArray="getSelectArray"
+ ></CommonFormTableView>
</div>
<!-- 閫夋嫨瀹℃壒娴佺▼ -->
<!-- <div v-if="editConfig.title === '鏂板缓'" class="basic-info-title">閫夋嫨瀹℃壒娴佺▼</div>
@@ -441,8 +449,9 @@
import { getSaleChanceList } from "@/api/sales/salesOpportunity"
import { getSubOrderList } from "@/api/sales/subOrder"
import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
-
+import { getDataByType } from "@/api/data"
import { mapActions } from "vuex"
+import { getQuotationList } from "@/api/sales/quotation"
export default {
name: "AddSalesDetailsDialog",
@@ -478,9 +487,11 @@
rules: {
client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: "change" }],
// subbill_name: [{ required: true, message: "璇烽�夋嫨閿�鍞瓙鍗�", trigger: "change" }],
- number: [{ required: true,validator: this.validateCheckCode, trigger: ["blur",'change'] }],
+ number: [{ required: true, validator: this.validateCheckCode, trigger: ["blur", "change"] }],
signTime: [{ required: true, message: "璇烽�夋嫨绛剧害鏃ユ湡", trigger: "change" }],
- memberId: [{ required: true, message: "璇烽�夋嫨閿�鍞礋璐ｄ汉", trigger: "change" }]
+ memberId: [{ required: true, message: "璇烽�夋嫨閿�鍞礋璐ｄ汉", trigger: "change" }],
+ sale_chance_name: [{ required: true, message: "璇烽�夋嫨閿�鍞満浼�", trigger: "change" }],
+ quotation_number: [{ required: true, message: "璇烽�夋嫨閿�鍞姤浠峰崟", trigger: "change" }]
// approvalOpinion: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }]
},
memberOptions: [],
@@ -522,30 +533,38 @@
infomation: {}
},
amountTotal: 0,
- isNameChanceEdit: false
+ isNameChanceEdit: false,
+ isAddQuatation: true,
+ // 浜や粯绫诲瀷
+ deliveryTypeList: getDataByType("deliveryType"),
+ quotationList: [],
+ quotationId: this.editCommonConfig.infomation.quotationId,
+ tableData: [],
+ selProductData: []
}
},
created() {
+ if (this.editConfig.title !== "鏂板缓") {
+ this.isAddQuatation = false
+ }
this.$store.dispatch("geClient")
- // this.$store.dispatch("geChance")
- // this.$store.dispatch("getSubunit")
this.setTableForm()
this.getCommonData()
this.formInfo()
- // if (this.editConfig.title === "鏂板缓" && this.editConfig.infomation.client_name.length > 0) {
- // this.isNameChanceEdit = true
- // }
- // else {
-
- // }
+ if (this.editConfig.title === "缂栬緫") {
+ this.productTableList.tableData = this.editConfig.infomation.products
+ }
},
watch: {
"editClientManageConfig.visible"(val) {
if (val) {
this.formInfo()
}
- },
+ }
},
+ // beforeUpdate() {
+ // this.$refs.commonFormTableView.toggleSelection(this.tableData)
+ // },
methods: {
...mapActions(["getChanceFilter", "getSubunitFliter"]),
formInfo() {
@@ -586,7 +605,7 @@
}
}
if (this.isNoProduct) {
- this.$message.error("浜у搧鍚嶇О涓嶈兘涓虹┖")
+ this.$message.error("璇烽�夋嫨浜у搧")
} else {
const params = this.saveParams()
console.log(params)
@@ -633,7 +652,7 @@
memberId: data.memberId || 0,
number: data.number || "",
phone: data.phone || "",
- products: this.tableData,
+ products: this.selProductData,
remark: data.remark || "",
saleChanceId: this.saleChanceId || 0,
saleType: data.saleType || 0,
@@ -642,6 +661,8 @@
logisticCompany: data.logisticCompany || "",
logisticCost: data.logisticCost || 0,
logisticNumber: data.logisticNumber || "",
+ quotationId: this.quotationId,
+ deliverType: data.deliverType || 0
}
let params = {}
if (this.editConfig.title === "鏂板缓") {
@@ -660,6 +681,39 @@
handleClose() {
this.editConfig.visible = false
},
+ // 鑾峰彇鎶ヤ环鍗�
+ getQuotation(id, value) {
+ getQuotationList({
+ page: 0,
+ pageSize: 0,
+ search_map: {
+ sale_chance_id: id
+ }
+ }).then((res) => {
+ if (res.code == 200) {
+ console.log(res)
+ this.quotationList = res.data.list
+ if (value === "鍏ㄩ儴浜у搧") {
+ this.quotationList.map((item) => {
+ if (item.id === this.editConfig.infomation.quotationId) {
+ this.tableData = item.products
+ this.tableData.map((item, index) => {
+ item.productId = index + 1
+ })
+ this.productTableList.tableData = item.products
+ this.selProductData.forEach((key) => {
+ this.tableData.forEach((row) => {
+ if (key.number === row.number) {
+ this.$refs.commonFormTableView.$refs.fromTable.toggleRowSelection(row, true)
+ }
+ })
+ })
+ }
+ })
+ }
+ }
+ })
+ },
// 閫夋嫨瀹㈡埛鐩稿叧鏂规硶
querySearchAsync(queryString, cb, value) {
var restaurants = []
@@ -670,13 +724,15 @@
restaurants = this.saleChancelist
} else if (value === "subbill") {
restaurants = this.subOrderList
+ } else if (value === "quotation") {
+ restaurants = this.quotationList
}
var results = queryString ? restaurants.filter(this.createStateFilter(queryString, value)) : restaurants
cb(results)
},
createStateFilter(queryString, value) {
return (state) => {
- if (value === "subbill") {
+ if (value === "subbill" || value === "quotation") {
return state.number.toLowerCase().indexOf(queryString.toLowerCase()) === 0
} else {
return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
@@ -710,8 +766,8 @@
},
handleSelectClient(value, item) {
if (value === "client") {
- this.editConfig.infomation.subbill_name =""
- this.editConfig.infomation.sale_chance_name=""
+ this.editConfig.infomation.subbill_name = ""
+ this.editConfig.infomation.sale_chance_name = ""
this.clientId = item.id
this.editConfig.infomation.client_name = item.name
this.getSaleChanceList(item)
@@ -719,10 +775,17 @@
} else if (value === "chance") {
this.saleChanceId = item.id
this.editConfig.infomation.sale_chance_name = item.name
+ this.isAddQuatation = false
+ this.getQuotation(item.id)
} else if (value === "subbill") {
console.log("涓嬫媺妗嗙偣鍑�", item)
this.subbillId = item.id
this.editConfig.infomation.subbill_name = item.number
+ } else if (value === "quotation") {
+ this.productTableList.tableData = item.products
+ // this.tableData = item.products
+ this.editConfig.infomation.quotation_number = item.number
+ this.quotationId = item.id
}
},
selClientClick(value) {
@@ -735,12 +798,17 @@
this.editSelCommonConfig.title = "閿�鍞瓙鍗�"
this.editSelCommonConfig.editVisible = true
this.editSelCommonConfig.clientId = this.clientId
+ } else if (value === "quotation") {
+ this.editSelCommonConfig.title = "鎶ヤ环鍗�"
+ this.editSelCommonConfig.editVisible = true
+ this.editSelCommonConfig.clientId = this.clientId
+ this.editSelCommonConfig.tableInfomation = [...this.quotationList]
}
},
selClient(row, value) {
if (value === "client") {
- this.editConfig.infomation.sale_chance_name=""
- this.editConfig.infomation.subbill_name=""
+ this.editConfig.infomation.sale_chance_name = ""
+ this.editConfig.infomation.subbill_name = ""
this.editConfig.infomation.client_name = row.name
this.clientId = row.id
this.getSaleChanceList(row)
@@ -748,21 +816,33 @@
} else if (value === "chance") {
this.editConfig.infomation.sale_chance_name = row.name
this.saleChanceId = row.id
+ this.isAddQuatation = false
+ this.getQuotation(row.id)
} else if (value === "subbill") {
this.editConfig.infomation.subbill_name = row.number
this.subbillId = row.id
+ } else if (value === "quotation") {
+ this.productTableList.tableData = row.products
+ // this.tableData = row.products
+ this.editConfig.infomation.quotation_number = row.number
+ this.quotationId = row.id
}
},
// 娓呴櫎宸查�夋嫨鐢ㄦ埛
clearupClient(value) {
if (value === "client") {
- this.editConfig.infomation.sale_chance_name=""
+ this.editConfig.infomation.sale_chance_name = ""
this.editConfig.infomation.client_name = ""
- this.editConfig.infomation.subbill_name =""
+ this.editConfig.infomation.subbill_name = ""
this.clientId = 0
+ this.saleChanceId = 0
+ this.subbillId = 0
} else if (value === "chance") {
this.editConfig.infomation.sale_chance_name = ""
this.saleChanceId = 0
+ this.isAddQuatation = true
+ this.editConfig.infomation.quotation_number = ""
+ this.quotationId = 0
} else if (value === "subbill") {
this.editConfig.infomation.subbill_name = ""
this.subbillId = 0
@@ -774,33 +854,21 @@
setFormatClick() {},
setTableForm() {
if (this.editConfig.title === "鏂板缓" || this.editConfig.infomation.products.length === 0) {
- this.tableData = [
- {
- productId: this.productId,
- id: 0,
- amount: 0,
- desc: "",
- name: "",
- number: "",
- price: 0,
- total: 0
- }
- ]
+ this.tableData = []
} else {
- this.tableData = this.editConfig.infomation.products
- this.tableData.map((item, index) => {
- item.productId = index + 1
- })
+ this.selProductData = this.editConfig.infomation.products
+ this.getQuotation(this.editConfig.infomation.saleChanceId, "鍏ㄩ儴浜у搧")
}
+ // let productData = this.quotationList.products
this.productTableList = {
tableData: this.tableData,
tableColumn: [
{ label: "#", prop: "productId", width: 40 },
- { label: "浜у搧鍚嶇О", prop: "name", productName: true, isRequird: true },
+ { label: "浜у搧鍚嶇О", prop: "name", isRequird: true },
{ label: "浜у搧缂栧彿", prop: "number" },
{ label: "鏁伴噺", prop: "amount", inputNumber: true, isRequird: true },
- { label: "閿�鍞崟浠�", prop: "price", inputFloat: true },
- { label: "浠风◣鍚堣", prop: "total", inputFloat: true }
+ { label: "閿�鍞崟浠�", prop: "price" },
+ { label: "浠风◣鍚堣", prop: "total" }
]
}
},
@@ -813,43 +881,9 @@
}
})
},
- // 浜у搧鏂板
- addProductClick() {
- this.productId++
- this.tableData.push({
- productId: this.productId,
- id: 0,
- amount: 0,
- desc: "",
- name: "",
- number: "",
- price: 0,
- total: 0
- })
- this.showSummary.show = true
- },
- // 浜у搧娓呯┖
- emptyProductClick() {
- this.productId = 1
- this.tableData = [
- {
- productId: this.productId,
- id: 0,
- amount: 0,
- desc: "",
- name: "",
- number: "",
- price: 0,
- total: 0
- }
- ]
- this.productTableList.tableData = this.tableData
- },
- // 浜у搧閲嶇畻
- recalculateProductClick() {},
- clearupProduct(data) {
- this.tableData = data
- this.productTableList.tableData = this.tableData
+ // 閫夋嫨浜у搧
+ getSelectArray(val) {
+ this.selProductData = val
}
}
}
diff --git a/src/views/sales/salesDetails/index.vue b/src/views/sales/salesDetails/index.vue
index ccf54eb..e3cf268 100644
--- a/src/views/sales/salesDetails/index.vue
+++ b/src/views/sales/salesDetails/index.vue
@@ -308,9 +308,9 @@
this.editConfig.infomation = {
...this.addConfig,
currency: "浜烘皯甯�",
- sale_chance_name:"",
- subbill_name:"",
- client_name: Object.keys(this.addConfig).length === 0 ? "" : this.addConfig.client_name
+ sale_chance_name: "",
+ subbill_name: "",
+ client_name: this.addConfig?.client_name ?? ""
}
},
// 缂栬緫
@@ -318,7 +318,13 @@
console.log(row)
this.editConfig.visible = true
this.editConfig.title = "缂栬緫"
- this.editConfig.infomation = { ...row, sale_chance_name: "", currency: "浜烘皯甯�",sale_chance_name:row.saleChance.name,}
+ this.editConfig.infomation = {
+ ...row,
+ currency: "浜烘皯甯�",
+ sale_chance_name: row.saleChance.name,
+ deliverType: row.deliverType === 0 ? "" : row.deliverType,
+ quotation_number: row.quotation.number
+ }
},
// 鍒犻櫎
delClick(rowID) {
diff --git a/src/views/sales/salesReturn/AddSalesReturnDialog.vue b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
index a54655e..449a169 100644
--- a/src/views/sales/salesReturn/AddSalesReturnDialog.vue
+++ b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
@@ -28,16 +28,14 @@
<el-input
v-if="
editConfig.title == '缂栬緫' ||
- (editConfig.title == '鏂板缓' &&
- codenumer &&
- (explain != '' || isIdDisabled))
+ (editConfig.title == '鏂板缓' && codenumer && (explain != '' || isIdDisabled))
"
:disabled="editConfig.title == '缂栬緫'"
v-model="editConfig.infomation.number"
placeholder="璇疯緭鍏ョ紪鐮�"
>
</el-input>
- <span v-else-if="editConfig.title == '鏂板缓'" style="color: #f56c6c"
+ <span v-else-if="editConfig.title == '鏂板缓'" style="color: #f56c6c"
>璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span
>
<!-- <WordInput
@@ -226,14 +224,13 @@
</div>
<div class="product-view">
<CommonFormTableView
+ ref="commonFormTableView"
:detail-enter="true"
+ :select-box="true"
:show-summary="showSummary"
:product-table-list="productTableList"
@inputContent="inputContent"
- @addProductClick="addProductClick"
- @emptyProductClick="emptyProductClick"
- @recalculateProductClick="recalculateProductClick"
- @clearupProduct="clearupProduct"
+ @getSelectArray="getSelectArray"
/>
</div>
</div>
@@ -267,7 +264,7 @@
import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
import codeMixin from "@/components/makepager/mixin/codeMixin"
import { getSalesDetailsList } from "@/api/sales/salesDetails"
-import { mapActions } from "vuex"
+// import { mapActions } from "vuex"
export default {
name: "AddSalesReturnDialog",
@@ -288,17 +285,17 @@
computed: {
clientList() {
return this.$store.state.getClientName.clientList
- },
- salesDetailsList() {
- return this.$store.state.getClientName.salesDetailsList
}
+ // salesDetailsList() {
+ // return this.$store.state.getClientName.salesDetailsList
+ // }
},
data() {
return {
dialogWidth: "50%",
editConfig: this.editCommonConfig,
rules: {
- number: [{ required: true, validator: this.validateCheckCode, trigger:["blur",'change']}],
+ number: [{ required: true, validator: this.validateCheckCode, trigger: ["blur", "change"] }],
repository: [{ required: true, message: "璇烽�夋嫨閫�鍏ヤ粨搴�", trigger: "change" }],
memberId: [{ required: true, message: "璇烽�夋嫨璐熻矗浜�", trigger: "change" }],
salesDetailNumber: [{ required: true, message: "璇烽�夋嫨閿�鍞槑缁嗗崟", trigger: "change" }]
@@ -329,12 +326,15 @@
productId: 1,
isNoProduct: true,
clientId: this.editCommonConfig.infomation.clientId,
- SalesDetailsId: this.editCommonConfig.infomation.SalesDetailsId
+ SalesDetailsId: this.editCommonConfig.infomation.SalesDetailsId,
+ tableData: [],
+ selProductData: [],
+ salesDetailsList: []
}
},
created() {
this.$store.dispatch("geClient")
- this.$store.dispatch("geSalesDetails")
+ // this.$store.dispatch("geSalesDetails")
this.setTableForm()
this.getCommonData()
// this.getProductList()
@@ -348,10 +348,10 @@
if (val) {
this.formInfo()
}
- },
+ }
},
methods: {
- ...mapActions(["getSalesDetailsFliter"]),
+ // ...mapActions(["getSalesDetailsFliter"]),
formInfo() {
this.objCode.type = "閿�鍞��璐х紪鐮�"
this.objCode.codeStandID = ""
@@ -387,42 +387,43 @@
this.$refs[formName].validate((valid) => {
if (valid) {
console.log(this.editConfig.infomation)
- // for (let i = 0; i < this.tableData.length; i++) {
- // if (this.tableData[i].name.length === 0) {
- // this.isNoProduct = true
- // break
- // } else {
- // this.isNoProduct = false
- // }
- // }
- // if (this.isNoProduct) {
- // this.$message.error("浜у搧鍚嶇О涓嶈兘涓虹┖")
- // } else {
- const params = this.saveParams()
- if (this.editConfig.title === "鏂板缓") {
- getAddSalesReturn(params).then((res) => {
- console.log(res)
- this.editConfig.visible = false
- if (res.code === 200) {
- this.$message.success("娣诲姞鎴愬姛")
- this.$parent.getData()
- }
- })
- } else {
- getUpdateSalesReturn(params).then((res) => {
- console.log(res)
- this.editConfig.visible = false
- if (res.code === 200) {
- this.$message.success("缂栬緫鎴愬姛")
- this.$parent.getData()
- }
- })
+ for (let i = 0; i < this.selProductData.length; i++) {
+ if (this.selProductData[i].name.length === 0) {
+ this.isNoProduct = true
+ break
+ } else {
+ this.isNoProduct = false
+ }
}
+ if (this.isNoProduct) {
+ this.$message.error("璇烽�夋嫨浜у搧")
+ } else {
+ const params = this.saveParams()
+ console.log(params)
+ if (this.editConfig.title === "鏂板缓") {
+ getAddSalesReturn(params).then((res) => {
+ console.log(res)
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ this.$message.success("娣诲姞鎴愬姛")
+ this.$parent.getData()
+ }
+ })
+ } else {
+ getUpdateSalesReturn(params).then((res) => {
+ console.log(res)
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ this.$message.success("缂栬緫鎴愬姛")
+ this.$parent.getData()
+ }
+ })
+ }
+ }
+ } else {
+ console.log("error submit")
+ return false
}
- // } else {
- // console.log("error submit")
- // return false
- // }
})
},
saveParams() {
@@ -433,19 +434,47 @@
clientId: this.clientId || 0,
memberId: data.memberId || 0,
number: data.number || "",
- products: this.tableData,
+ products: this.selProductData,
reason: data.reason || "",
repository: data.repository || "",
returnDate: data.returnDate || "",
salesReturnStatusId: data.salesReturnStatusId || 0,
sourceId: this.SalesDetailsId,
- sourceType: 1,
+ sourceType: 1
}
}
return params
},
handleClose() {
this.editConfig.visible = false
+ },
+ // 鑾峰彇閿�鍞槑缁�
+ async getSalesDetailsList(id, value) {
+ await getSalesDetailsList({
+ clientId: id
+ }).then((res) => {
+ if (res.code == 200) {
+ this.salesDetailsList = res.data.list
+ if (value === "鍏ㄩ儴浜у搧") {
+ this.salesDetailsList.map((item) => {
+ if (item.id === this.editConfig.infomation.sourceId) {
+ this.tableData = item.products
+ this.tableData.map((item, index) => {
+ item.productId = index + 1
+ })
+ this.productTableList.tableData = item.products
+ this.selProductData.forEach((key) => {
+ this.tableData.forEach((row) => {
+ if (key.number === row.number) {
+ this.$refs.commonFormTableView.$refs.fromTable.toggleRowSelection(row, true)
+ }
+ })
+ })
+ }
+ })
+ }
+ }
+ })
},
// 閫夋嫨鐢ㄦ埛鐩稿叧鏂规硶
querySearchAsync(queryString, cb, value) {
@@ -472,14 +501,9 @@
this.editConfig.infomation.salesDetailNumber = ""
this.clientId = item.id
this.editSelCommonConfig.clientId = item.id
- await getSalesDetailsList({
- clientId: this.clientId
- }).then((res) => {
- this.getSalesDetailsFliter(res.data.list)
- })
+ this.getSalesDetailsList(item.id)
} else if (value === "contract") {
this.productTableList.tableData = item.products
- this.tableData = item.products
this.SalesDetailsId = item.id
}
},
@@ -490,6 +514,7 @@
} else if (value === "contract") {
this.editSelCommonConfig.title = "閿�鍞槑缁嗗崟"
this.editSelCommonConfig.editVisible = true
+ this.editSelCommonConfig.clientId = this.clientId
// this.editSelCommonConfig.salesDetailNumber = this.editConfig.infomation.salesDetailNumber
}
},
@@ -500,16 +525,11 @@
this.editConfig.infomation.client_name = row.name
this.clientId = row.id
this.editSelCommonConfig.clientId = row.id
- await getSalesDetailsList({
- clientId: row.id
- }).then((res) => {
- this.getSalesDetailsFliter(res.data.list)
- })
+ this.getSalesDetailsList(row.id)
} else if (value === "contract") {
this.editConfig.infomation.salesDetailNumber = row.number
this.SalesDetailsId = row.id
this.productTableList.tableData = row.products
- this.tableData = row.products
}
},
// 娓呴櫎宸查�夋嫨鐢ㄦ埛
@@ -520,6 +540,7 @@
this.clientId = 0
} else if (value === "contract") {
this.editConfig.infomation.salesDetailNumber = ""
+ this.productTableList.tableData = []
}
},
// 娣诲姞闄勪欢
@@ -528,24 +549,12 @@
setFormatClick() {},
setTableForm() {
if (this.editConfig.title === "鏂板缓" || this.editConfig.infomation.products.length === 0) {
- this.tableData = [
- {
- productId: this.productId,
- id: 0,
- amount: 0,
- desc: "",
- name: "",
- number: "",
- price: 0,
- total: 0
- }
- ]
+ this.tableData = []
} else {
- this.tableData = this.editConfig.infomation.products
- this.tableData.map((item, index) => {
- item.productId = index + 1
- })
+ this.selProductData = this.editConfig.infomation.products
+ this.getSalesDetailsList(this.editConfig.infomation.clientId, "鍏ㄩ儴浜у搧")
}
+ console.log(this.tableData)
this.productTableList = {
tableData: this.tableData,
tableColumn: [
@@ -567,43 +576,10 @@
}
})
},
- // 浜у搧鏂板
- addProductClick() {
- this.productId++
- this.tableData.push({
- productId: this.productId,
- id: 0,
- amount: 0,
- desc: "",
- name: "",
- number: "",
- price: 0,
- total: 0
- })
- this.showSummary.show = true
- },
- // 浜у搧娓呯┖
- emptyProductClick() {
- this.productId = 1
- this.tableData = [
- {
- productId: this.productId,
- id: 0,
- amount: 0,
- desc: "",
- name: "",
- number: "",
- price: 0,
- total: 0
- }
- ]
- this.productTableList.tableData = this.tableData
- },
- // 浜у搧閲嶇畻
- recalculateProductClick() {},
- clearupProduct(data) {
- this.tableData = data
- this.productTableList.tableData = this.tableData
+ // 閫夋嫨浜у搧
+ getSelectArray(val) {
+ console.log(val, "cccccccccccccccccc")
+ this.selProductData = val
}
}
}
diff --git a/src/views/sales/salesReturn/index.vue b/src/views/sales/salesReturn/index.vue
index 9850bf9..5b363eb 100644
--- a/src/views/sales/salesReturn/index.vue
+++ b/src/views/sales/salesReturn/index.vue
@@ -141,7 +141,8 @@
{ label: "閿�鍞礋璐ｄ汉", prop: "member_name" }
// { label: "淇敼鏃堕棿", prop: "modifyTime", isTime: true, min: 130 }
],
- showCol: ["閿�鍞��璐у崟缂栧彿", "瀹㈡埛鍚嶇О", "閫�璐ф棩鏈�", "鐘舵��", "閫�鍏ヤ粨搴�", "搴旈��娆�", "宸查��娆�", "閿�鍞礋璐ｄ汉"]
+ showCol: ["閿�鍞��璐у崟缂栧彿", "瀹㈡埛鍚嶇О", "閫�璐ф棩鏈�", "鐘舵��", "閫�鍏ヤ粨搴�", "搴旈��娆�", "宸查��娆�", "閿�鍞礋璐ｄ汉"],
+ products: []
}
},
created() {
@@ -243,7 +244,7 @@
addBtnClick() {
this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
- this.editConfig.infomation = { currency: "浜烘皯甯�",salesDetailNumber:"",client_name:""}
+ this.editConfig.infomation = { currency: "浜烘皯甯�", salesDetailNumber: "", client_name: "" }
},
// 缂栬緫
handleClick(row) {
diff --git a/vue.config.js b/vue.config.js
index 670f28b..83bffdf 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,6 +1,6 @@
const path = require("path")
// 鍩虹璺緞 娉ㄦ剰鍙戝竷涔嬪墠瑕佸厛淇敼杩欓噷
-const publicPath = "/"
+const publicPath = process.env.VUE_APP_PUBLIC_PATH || "/"
function resolve(dir) {
return path.join(__dirname, dir)
}
@@ -19,7 +19,7 @@
// target: "http://192.168.20.118:8002",
ws: true,
changeOrigin: true
- },
+ }
}
},
transpileDependencies: [
@@ -33,7 +33,7 @@
configNew.externals = externals
configNew.plugins = []
} else if (process.env.NODE_ENV === "development") {
- // console.log("development", config)
+ console.log("development", config)
}
return configNew
},
--
Gitblit v1.8.0