From 4a63f03516cc177ad60ebbe28a65e80587846b3e Mon Sep 17 00:00:00 2001 From: yangfeng <wanwan926_4@163.com> Date: 星期四, 24 八月 2023 14:56:45 +0800 Subject: [PATCH] 新增销售退款单增加选择退货单及其他bug --- src/views/service/serviceContract/AddServiceContractDialog.vue | 14 + src/views/other/payment/receipt/addReceipt.vue | 87 +++++++--- .gitignore | 45 ++--- src/store/modules/getClientName.js | 17 ++ src/views/other/commonDialog/SelectClientDialog.vue | 4 vue.config.js | 27 --- src/views/service/clientServiceOrder/DetailClientServiceOrder.vue | 4 src/components/makepager/CommonFormTableView.vue | 2 src/views/other/commonDialog/SelectCommonDialog.vue | 39 ++++ src/views/sales/salesReturn/AddSalesReturnDialog.vue | 35 --- src/views/sales/refundForm/AddRefundFormDialog.vue | 189 ++++++++++++++++------- src/views/service/serviceFollowup/DetailServiceFollowup.vue | 4 src/views/sales/salesDetails/DetailSpecification.vue | 4 src/views/other/payment/receipt/index.vue | 1 src/views/other/payment/collectionPlan/AddCollectionPlan.vue | 1 src/views/sales/contractManage/AddContractManageDialog.vue | 6 16 files changed, 296 insertions(+), 183 deletions(-) diff --git a/.gitignore b/.gitignore index a4af05a..a0dddc6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,28 +1,21 @@ -# Logs -logs -*.log - -# Runtime data -pids -*.pid -*.seed - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage - -# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# Compiled binary addons (http://nodejs.org/api/addons.html) -build/Release - -# Dependency directory -# Commenting this out is preferred by some people, see -# https://npmjs.org/doc/faq.html#Should-I-check-my-node_modules-folder-into-git +.DS_Store node_modules +/dist -# Users Environment Variables -.lock-wscript +# local env files +.env.local +.env.*.local + +# Log files +npm-debug.log* +yarn-debug.log* +yarn-error.log* + +# Editor directories and files +.idea +.vscode +*.suo +*.ntvs* +*.njsproj +*.sln +*.sw? diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue index 55fee16..00c60c6 100644 --- a/src/components/makepager/CommonFormTableView.vue +++ b/src/components/makepager/CommonFormTableView.vue @@ -8,6 +8,7 @@ :span-method="arraySpanMethod" style="width: 100%" > + <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" :key="i" @@ -170,6 +171,7 @@ default: () => { return { tableData: [], // 鎺ュ彛杩斿洖鏁版嵁 + isReturn: false, tableColumn: [ // table琛ㄥ崟 { label: "", prop: "", min: 200, tooltip: true } diff --git a/src/store/modules/getClientName.js b/src/store/modules/getClientName.js index 90f5a17..f24918d 100644 --- a/src/store/modules/getClientName.js +++ b/src/store/modules/getClientName.js @@ -9,6 +9,7 @@ import { getQuotationList } from "@/api/sales/quotation" import { getServiceOrderList } from "@/api/serviceManage/clientServiceOrder" import { getProductList } from "@/api/common/other" +import { getSalesReturnList } from "@/api/sales/salesReturn" import { Message } from "element-ui" export default { @@ -23,7 +24,8 @@ salesDetailsList: [], // 閿�鍞槑缁嗗崟 quotationList: [], // 鎶ヤ环鍗� serviceOrderList: [], // 瀹㈡埛鏈嶅姟鍗� - productList: [] // 浜у搧鍒楄〃 + productList: [], // 浜у搧鍒楄〃 + salesReturnList: [] // 閿�鍞��璐у崟 }, mutations: { clientNameList(state, payload) { @@ -58,6 +60,9 @@ }, productList(state, payload) { state.productList = payload + }, + salesReturnList(state, payload) { + state.salesReturnList = payload } }, actions: { @@ -160,6 +165,16 @@ Message.error(res.msg) } }) + }, + geReturnList(context) { + getSalesReturnList({ productName: "", productNumber: "", page: 1, pageSize: 10 }).then((res) => { + if (res.code == 200) { + console.log(res.data.list) + context.commit("salesReturnList", res.data.list) + } else { + Message.error(res.msg) + } + }) } } } diff --git a/src/views/other/commonDialog/SelectClientDialog.vue b/src/views/other/commonDialog/SelectClientDialog.vue index 0f09db5..c248902 100644 --- a/src/views/other/commonDialog/SelectClientDialog.vue +++ b/src/views/other/commonDialog/SelectClientDialog.vue @@ -81,8 +81,8 @@ { label: "瀹㈡埛鍚嶇О", prop: "name", min: 100, isClientClick: true }, { label: "瀹㈡埛缂栧彿", prop: "number" }, { label: "瀹㈡埛鐘舵��", prop: "client_status" }, - { label: "閿�鍞礋璐d汉", prop: "member_name" }, - { label: "娉曞畾浠h〃浜�", prop: "representative" }, + { label: "閿�鍞礋璐d汉", prop: "member_name", min: 100 }, + { label: "娉曞畾浠h〃浜�", prop: "representative", min: 100 }, { label: "娉ㄥ唽鏃堕棿", prop: "registration_time" }, { label: "缁忚惀鑼冨洿", prop: "business_scope" }, { label: "璇︾粏鍦板潃", prop: "detail_address" }, diff --git a/src/views/other/commonDialog/SelectCommonDialog.vue b/src/views/other/commonDialog/SelectCommonDialog.vue index 3090ad6..1225670 100644 --- a/src/views/other/commonDialog/SelectCommonDialog.vue +++ b/src/views/other/commonDialog/SelectCommonDialog.vue @@ -45,6 +45,7 @@ import { getServiceContractList } from "@/api/serviceManage/serviceContract" import { getServiceOrderList } from "@/api/serviceManage/clientServiceOrder" import { getProductList } from "@/api/common/other" +import { getSalesReturnList } from "@/api/sales/salesReturn" export default { name: "EditSelCommonDialog", props: { @@ -150,6 +151,17 @@ ] } this.searchSel = { value: "name", label: "浜у搧鍚嶇О" } + } else if (this.editConfig.title === "閿�鍞��璐у崟") { + this.tableList = { + tableInfomation: [], + tableColumn: [ + { label: "閫�璐у崟缂栧彿", prop: "number", isClick: true }, + { label: "閫�璐ф棩鏈�", prop: "returnDate" }, + { label: "鐘舵��", prop: "salesReturnStatus_name" }, + { label: "閫�鍏ヤ粨搴�", prop: "repository" } + ] + } + this.searchSel = { value: "number", label: "閿�鍞��璐у崟缂栧彿" } } this.searchOptions = [] for (let i = 0; i < this.tableList.tableColumn.length; i++) { @@ -173,6 +185,8 @@ this.getServiceOrderList() } else if (this.editConfig.title === "浜у搧鍚嶇О") { this.getProductList() + } else if (this.editConfig.title === "閿�鍞��璐у崟") { + this.getSalesReturnList() } }, // 閿�鍞�诲崟 @@ -326,6 +340,29 @@ this.loading = false }) }, + async getSalesReturnList() { + await getSalesReturnList({ + keyword: this.keyword, + keywordType: this.keywordType, + page: 0, + pageSize: 0 + }).then((res) => { + if (res.code === 200) { + if (res.data.list && res.data.list.length > 0) { + const list = res.data.list.map((item) => { + return { + ...item, + salesReturnStatus_name: item.SalesReturnStatus.name + } + }) + this.tableList.tableInfomation = list.slice(0, 5) || [] + } else { + this.tableList.tableInfomation = [] + } + } + this.loading = false + }) + }, handleClose() { this.editConfig.editVisible = false }, @@ -343,6 +380,8 @@ this.$emit("selClient", row, "customService") } else if (this.editConfig.title === "浜у搧鍚嶇О") { this.$emit("selClient", row, "productName") + } else if (this.editConfig.title === "閿�鍞��璐у崟") { + this.$emit("selClient", row, "salesReturn") } }, // 鎼滅储 diff --git a/src/views/other/payment/collectionPlan/AddCollectionPlan.vue b/src/views/other/payment/collectionPlan/AddCollectionPlan.vue index 7a67908..0d80cbd 100644 --- a/src/views/other/payment/collectionPlan/AddCollectionPlan.vue +++ b/src/views/other/payment/collectionPlan/AddCollectionPlan.vue @@ -182,7 +182,6 @@ mergeNumber: 7 }, tableData: [], - productId: 1, addProductArr: [], memberOptions: [], allTerms: 3, diff --git a/src/views/other/payment/receipt/addReceipt.vue b/src/views/other/payment/receipt/addReceipt.vue index 1c58f1a..0a9203d 100644 --- a/src/views/other/payment/receipt/addReceipt.vue +++ b/src/views/other/payment/receipt/addReceipt.vue @@ -529,52 +529,83 @@ // 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡 setFormatClick() {}, setTableForm() { - if (this.editConfig.title === "鏂板缓") { + if (this.editConfig.title === "鏂板缓" || this.editConfig.infomation.products.length === 0) { this.tableData = [ { - id: 1, - Amount: 0, - IsSale: true, - MaterialMode: "", - MinInventory: 0, - Name: "", - Number: "", - PurchaseType: "", - SalePrice: 0, - Unit: "" + productId: this.productId, + id: 0, + amount: 0, + desc: "", + name: "", + number: "", + price: 0, + total: 0 } ] } else { this.tableData = this.editConfig.infomation.products + this.tableData.map((item, index) => { + item.productId = index + 1 + }) } this.productTableList = { tableData: this.tableData, tableColumn: [ - { label: "#", prop: "id", width: 40 }, - { label: "浜у搧鍚嶇О", prop: "Name", input: true, isRequird: true }, - { label: "浜у搧缂栧彿", prop: "Number" }, - { label: "鏁伴噺", prop: "Amount", input: true, isRequird: true }, - { label: "閿�鍞崟浠�", prop: "Unit", input: true }, - { label: "浠风◣鍚堣", prop: "total", input: true }, - { label: "鎻忚堪", prop: "other8" } + { label: "#", prop: "productId", width: 40 }, + { label: "浜у搧鍚嶇О", prop: "name", productName: true, isRequird: true }, + { label: "浜у搧缂栧彿", prop: "number" }, + { label: "鏁伴噺", prop: "amount", inputNumber: true, isRequird: true }, + { label: "閿�鍞崟浠�", prop: "price", inputFloat: true }, + { label: "浠风◣鍚堣", prop: "total", inputFloat: true } ] } + }, + // 浜у搧鍒楄〃杈撳叆 + inputContent(val, prop, row) { + this.productId = row.productId + this.tableData.map((item) => { + if (item.productId === row.productId) { + item[prop] = val + } + }) }, // 浜у搧鏂板 addProductClick() { this.productId++ this.tableData.push({ - id: this.productId, - Amount: 0, - IsSale: true, - MaterialMode: "", - MinInventory: 0, - Name: "", - Number: "", - PurchaseType: "", - SalePrice: 0, - Unit: "" + 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 } } } diff --git a/src/views/other/payment/receipt/index.vue b/src/views/other/payment/receipt/index.vue index 63f0b6d..c8fc457 100644 --- a/src/views/other/payment/receipt/index.vue +++ b/src/views/other/payment/receipt/index.vue @@ -159,6 +159,7 @@ const list = res.data.data.data.map((item) => { return { ...item, + client_name: item.client.name, paymentType_name: item.paymentType.name, principal_name: item.principal.username } diff --git a/src/views/sales/contractManage/AddContractManageDialog.vue b/src/views/sales/contractManage/AddContractManageDialog.vue index b2e3135..df7a5ea 100644 --- a/src/views/sales/contractManage/AddContractManageDialog.vue +++ b/src/views/sales/contractManage/AddContractManageDialog.vue @@ -353,9 +353,9 @@ }, selClient(row, value) { console.log(value) - if (value === "contact") { - this.editConfig.infomation.contact_name = row.name - this.contactId = row.id + if (value === "client") { + this.editConfig.infomation.client_name = row.name + this.clientId = row.id } else if (value === "quotation") { this.editConfig.infomation.quotation_number = row.number this.quotationId = row.id diff --git a/src/views/sales/refundForm/AddRefundFormDialog.vue b/src/views/sales/refundForm/AddRefundFormDialog.vue index ff4d7df..b9dadd8 100644 --- a/src/views/sales/refundForm/AddRefundFormDialog.vue +++ b/src/views/sales/refundForm/AddRefundFormDialog.vue @@ -28,14 +28,18 @@ <div class="custom-name"> <el-autocomplete v-model="editConfig.infomation.client_name" - :fetch-suggestions="querySearchAsync" + :fetch-suggestions=" + (queryString, callback) => { + querySearchAsync(queryString, callback, 'client') + } + " value-key="name" - @select="handleSelectClient" + @select="handleSelectClient('client', $event)" ></el-autocomplete> - <div class="common-select-btn" @click="selClientClick"> + <div class="common-select-btn" @click="selClientClick('client')"> <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i> </div> - <div class="common-select-btn" @click="clearupClient"> + <div class="common-select-btn" @click="clearupClient('client')"> <i class="el-icon-edit-outline" title="娓呴櫎"></i> </div> </div> @@ -46,19 +50,28 @@ <el-input v-model="editConfig.infomation.number"></el-input> </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-option> - </el-select> + <el-col :span="12"> + <el-form-item label="閿�鍞��璐у崟" prop="sale_return_nunber"> + <div class="custom-name"> + <el-autocomplete + v-model="editConfig.infomation.sale_return_nunber" + :fetch-suggestions=" + (queryString, callback) => { + querySearchAsync(queryString, callback, 'salesReturn') + } + " + value-key="number" + @select="handleSelectClient('salesReturn', $event)" + ></el-autocomplete> + <div class="common-select-btn" @click="selClientClick('salesReturn')"> + <i class="el-icon-circle-plus-outline"></i> + </div> + <div class="common-select-btn" @click="clearupClient('salesReturn')"> + <i class="el-icon-edit-outline"></i> + </div> + </div> </el-form-item> - </el-col> --> + </el-col> <el-col :span="12"> <el-form-item label="閿�鍞礋璐d汉" prop="memberId"> <el-select @@ -92,7 +105,12 @@ class="common-select-sel" size="mini" > - <el-option v-for="item in refundMethodOptions" :key="item.id" :label="item.name" :value="item.id"> + <el-option + v-for="item in paymentTypeListOptions" + :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> --> @@ -100,10 +118,10 @@ </el-form-item> </el-col> <el-col :span="12"> - <el-form-item label="璐︽埛" prop="accountId"> + <el-form-item label="璐︽埛" prop="bankAccountId"> <div class="common-select"> <el-select - v-model="editConfig.infomation.accountId" + v-model="editConfig.infomation.bankAccountId" placeholder="璇烽�夋嫨" class="common-select-sel" size="mini" @@ -188,6 +206,7 @@ <div class="product-view"> <CommonFormTableView :show-summary="showSummary" + :detail-enter="detailEnter" :product-table-list="productTableList" @inputContent="inputContent" @addProductClick="addProductClick" @@ -248,6 +267,12 @@ :edit-common-config="editSelectClientConfig" @selClient="selClient" /> + <!-- 閫夋嫨閿�鍞��璐у崟 --> + <SelectCommonDialog + v-if="editSelCommonConfig.editVisible" + :edit-common-config="editSelCommonConfig" + @selClient="selClient" + /> </el-dialog> </div> </template> @@ -257,6 +282,8 @@ import { getAllData } from "@/api/client/client" import { getAddSalesRefund, getUpdateSalesRefund } from "@/api/sales/refundForm" import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog" +import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog" +import { getPaymentTypeList } from "@/api/common/payment" export default { name: "AddRefundFormDialog", props: { @@ -271,10 +298,13 @@ } } }, - components: { CommonFormTableView, SelectClientDialog }, + components: { CommonFormTableView, SelectClientDialog, SelectCommonDialog }, computed: { clientList() { return this.$store.state.getClientName.clientList + }, + salesReturnList() { + return this.$store.state.getClientName.salesReturnList } }, data() { @@ -282,15 +312,15 @@ dialogWidth: "80%", editConfig: this.editCommonConfig, rules: { - clientId: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }], + 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" }], - account: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }] + sale_return_nunber: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }] }, memberOptions: [], // selSourceOrderOptions: [{ value: "1", label: "閿�鍞��璐у崟" }], // 閫夋嫨婧愬崟 - refundMethodOptions: [], // 浠樻鏂瑰紡 + paymentTypeListOptions: [], // 浠樻鏂瑰紡 accountOptions: [], // 璐︽埛 isInvoiceOptions: ["鏄�", "鍚�"], // 鏄惁寮�绁� currencyOptions: [{ id: 1, name: "浜烘皯甯�" }], // 甯佺 @@ -299,37 +329,48 @@ showSummary: { show: true, total: true, - sumProp: ["other1", "other2", "other3", "other4"], - mergeNumber: 5 + sumProp: ["Amount", "total"], + mergeNumber: 2 }, editSelectClientConfig: { editVisible: false, title: "", infomation: {} }, + editSelCommonConfig: { + editVisible: false, + title: "", + infomation: {} + }, clientId: this.editCommonConfig.infomation.client_id, + sourceId: this.editCommonConfig.infomation.sourceId, productId: 1, - isNoProduct: true + isNoProduct: true, + detailEnter: true } }, created() { this.$store.dispatch("geClient") + this.$store.dispatch("geReturnList") this.setTableForm() this.getCommonData() }, methods: { getCommonData() { - getAllData() - .then((res) => { - this.memberOptions = res.data.member - this.refundMethodOptions = res.data.refundMethod - this.accountOptions = res.data.accountId - // this.isInvoiceOptions = res.data.isInvoice - // this.currencyOptions = res.data.currency - }) - .catch((err) => { - console.log(err) - }) + getAllData().then((res) => { + this.memberOptions = res.data.member + this.accountOptions = res.data.accountId + }) + this.getPaymentTypeList() + }, + async getPaymentTypeList() { + await getPaymentTypeList().then((res) => { + console.log("鏀粯鏂瑰紡") + console.log(res.data) + if (res.data.code === 200) { + this.paymentTypeListOptions = res.data.data.data + } + }) }, // 淇濆瓨 saveClick(formName) { @@ -380,15 +421,17 @@ let params = { id: this.editConfig.title === "鏂板缓" ? 0 : data.id, salesRefund: { - accountId: data.accountId || 0, + bankAccountId: data.bankAccountId || 0, clientId: this.clientId || 0, isInvoice: data.isInvoice || "", memberId: data.memberId || 0, number: data.number || "", + paymentTypeId: data.paymentTypeId || 0, products: this.tableData, reason: data.reason || "", refundDate: data.refundDate || "", - refundMethod: data.refundMethod || "" + sourceId: this.sourceId || 0, + sourceType: 1 } } return params @@ -397,31 +440,64 @@ this.editConfig.visible = false }, // 閫夋嫨瀹㈡埛鐩稿叧鏂规硶 - querySearchAsync(queryString, cb) { - var restaurants = this.clientList - var results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants + querySearchAsync(queryString, cb, value) { + var restaurants = [] + if (value === "client") { + restaurants = this.clientList + } else if (value === "salesReturn") { + restaurants = this.salesReturnList + } + var results = queryString ? restaurants.filter(this.createStateFilter(queryString, value)) : restaurants cb(results) }, - createStateFilter(queryString) { + createStateFilter(queryString, value) { return (state) => { - return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0 + if (value === "salesReturn") { + return state.number.toLowerCase().indexOf(queryString.toLowerCase()) === 0 + } else if (value === "productName") { + return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0 + } } }, - handleSelectClient(item) { - this.clientId = item.id + handleSelectClient(value, item) { + if (value === "client") { + this.clientId = item.id + } else if (value === "salesReturn") { + console.log(item) + this.editConfig.infomation.sale_return_nunber = item.number + this.sourceId = item.id + this.tableData = item.products + this.productTableList.tableData = item.products + } }, - selClientClick() { - this.editSelectClientConfig.editVisible = true + selClientClick(value) { + if (value === "client") { + this.editSelectClientConfig.editVisible = true + } else if (value === "salesReturn") { + this.editSelCommonConfig.title = "閿�鍞��璐у崟" + this.editSelCommonConfig.editVisible = true + } }, - selClient(row) { - console.log(row) - this.editConfig.infomation.client_name = row.name - this.clientId = row.id + selClient(row, value) { + if (value === "client") { + this.editConfig.infomation.client_name = row.name + this.clientId = row.id + } else if (value === "salesReturn") { + this.editConfig.infomation.sale_return_nunber = row.number + this.sourceId = row.id + this.tableData = row.products + this.productTableList.tableData = row.products + } }, // 娓呴櫎宸查�夋嫨鐢ㄦ埛 - clearupClient() { - this.editConfig.infomation.client_name = "" - this.clientId = 0 + clearupClient(value) { + if (value === "client") { + this.editConfig.infomation.client_name = "" + this.clientId = 0 + } else if (value === "salesReturn") { + this.editConfig.infomation.sale_return_nunber = "" + this.sourceId = 0 + } }, // 娣诲姞闄勪欢 addAnnexClick() {}, @@ -449,8 +525,9 @@ } this.productTableList = { tableData: this.tableData, + isReturn: true, tableColumn: [ - { label: "#", prop: "productId", width: 40 }, + // { label: "#", prop: "productId", width: 40 }, { label: "浜у搧鍚嶇О", prop: "name", productName: true, isRequird: true }, { label: "浜у搧缂栧彿", prop: "number" }, { label: "鏁伴噺", prop: "amount", inputNumber: true, isRequird: true }, diff --git a/src/views/sales/salesDetails/DetailSpecification.vue b/src/views/sales/salesDetails/DetailSpecification.vue index 27f8f04..eacde64 100644 --- a/src/views/sales/salesDetails/DetailSpecification.vue +++ b/src/views/sales/salesDetails/DetailSpecification.vue @@ -339,7 +339,7 @@ leftStr: "鍒涘缓浜�", leftValue: "", rightStr: "鍒涘缓鏃堕棿", - rightValue: "" + rightValue: item.createTime } ] this.deliveryInfoList = [ @@ -359,7 +359,7 @@ this.dynamicInfoList = [ { leftStr: "淇敼鏃堕棿", - leftValue: "", + leftValue: item.updateTime, rightStr: "鍑哄簱鐘舵��", rightValue: "" }, diff --git a/src/views/sales/salesReturn/AddSalesReturnDialog.vue b/src/views/sales/salesReturn/AddSalesReturnDialog.vue index a7d1e66..82ef2b7 100644 --- a/src/views/sales/salesReturn/AddSalesReturnDialog.vue +++ b/src/views/sales/salesReturn/AddSalesReturnDialog.vue @@ -46,28 +46,10 @@ <el-input v-model="editConfig.infomation.number"></el-input> </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-option> - </el-select> - </el-form-item> - </el-col> --> <el-col :span="12"> <el-form-item label="閫�鍏ヤ粨搴�" prop="repository"> <el-select v-model="editConfig.infomation.repository" size="mini" style="width: 63%"> - <el-option - v-for="item in repositoryOptions" - :key="item.value" - :label="item.label" - :value="item.value" - > + <el-option v-for="item in repositoryOptions" :key="item.id" :label="item.name" :value="item.name"> </el-option> </el-select> </el-form-item> @@ -253,7 +235,8 @@ infomation: {} }, productId: 1, - isNoProduct: true + isNoProduct: true, + clientId: this.editCommonConfig.infomation.clientId } }, created() { @@ -318,10 +301,6 @@ this.editConfig.visible = false if (res.code === 200) { this.$message.success("缂栬緫鎴愬姛") - this.$message({ - message: "缂栬緫鎴愬姛", - type: "success" - }) this.$parent.getData() } }) @@ -338,7 +317,7 @@ let params = { id: this.editConfig.title === "鏂板缓" ? 0 : data.id, salesReturn: { - clientId: data.clientId || 0, + clientId: this.clientId || 0, memberId: data.memberId || 0, number: data.number || "", products: this.tableData, @@ -365,7 +344,7 @@ } }, handleSelectClient(item) { - this.editConfig.infomation.client_id = item.id + this.clientId = item.id }, selClientClick() { this.editSelectClientConfig.editVisible = true @@ -373,12 +352,12 @@ selClient(row) { console.log(row) this.editConfig.infomation.client_name = row.name - this.editConfig.infomation.client_id = row.id + this.clientId = row.id }, // 娓呴櫎宸查�夋嫨鐢ㄦ埛 clearupClient() { this.editConfig.infomation.client_name = "" - this.editConfig.infomation.client_id = 0 + this.clientId = 0 }, // 娣诲姞闄勪欢 addAnnexClick() {}, diff --git a/src/views/service/clientServiceOrder/DetailClientServiceOrder.vue b/src/views/service/clientServiceOrder/DetailClientServiceOrder.vue index 7c3bdeb..27f6b6b 100644 --- a/src/views/service/clientServiceOrder/DetailClientServiceOrder.vue +++ b/src/views/service/clientServiceOrder/DetailClientServiceOrder.vue @@ -399,7 +399,7 @@ }, { leftStr: "鍒涘缓鏃堕棿", - leftValue: "", + leftValue: data.createTime, rightStr: "鍒涘缓浜�", rightValue: "" } @@ -415,7 +415,7 @@ leftStr: "鏈�鏂版洿鏂颁汉", leftValue: "", rightStr: "淇敼鏃堕棿", - rightValue: "" + rightValue: data.updateTime } ] this.timeAmountList = [ diff --git a/src/views/service/serviceContract/AddServiceContractDialog.vue b/src/views/service/serviceContract/AddServiceContractDialog.vue index e1c27ff..928e399 100644 --- a/src/views/service/serviceContract/AddServiceContractDialog.vue +++ b/src/views/service/serviceContract/AddServiceContractDialog.vue @@ -152,10 +152,10 @@ </el-form-item> </el-col> <el-col :span="12"> - <el-form-item label="鍚堝悓绫诲瀷" prop="typeId"> + <el-form-item label="鍚堝悓绫诲瀷" prop="serviceContractTypeId"> <div class="common-select"> <el-select - v-model="editConfig.infomation.typeId" + v-model="editConfig.infomation.serviceContractTypeId" placeholder="璇烽�夋嫨" class="common-select-sel" size="mini" @@ -207,10 +207,10 @@ <div class="basic-info-view"> <el-row> <el-col :span="12"> - <el-form-item label="鍚堝悓鐘舵��" prop="statusId"> + <el-form-item label="鍚堝悓鐘舵��" prop="serviceContractStatusId"> <div class="common-select"> <el-select - v-model="editConfig.infomation.statusId" + v-model="editConfig.infomation.serviceContractStatusId" placeholder="璇烽�夋嫨" class="common-select-sel" size="mini" @@ -577,9 +577,11 @@ serviceTimes: data.serviceTimes || 0, signTime: data.signTime || "", startTime: data.startTime || "", - statusId: data.statusId || 0, + statusId: 0, terms: data.terms || "", - typeId: data.typeId || 0 + typeId: 0, + serviceContractTypeId: data.serviceContractTypeId || 0, + serviceContractStatusId: data.serviceContractStatusId || 0 } return params }, diff --git a/src/views/service/serviceFollowup/DetailServiceFollowup.vue b/src/views/service/serviceFollowup/DetailServiceFollowup.vue index daa2526..b952172 100644 --- a/src/views/service/serviceFollowup/DetailServiceFollowup.vue +++ b/src/views/service/serviceFollowup/DetailServiceFollowup.vue @@ -157,9 +157,9 @@ }, { leftStr: "鍒涘缓鏃堕棿", - leftValue: "", + leftValue: item.createTime, rightStr: "淇敼鏃堕棿", - rightValue: "" + rightValue: item.updateTime } ] }, diff --git a/vue.config.js b/vue.config.js index acddc1b..767e5e8 100644 --- a/vue.config.js +++ b/vue.config.js @@ -13,36 +13,11 @@ productionSourceMap: false, // 濡傛灉浣犱笉闇�瑕佺敓浜х幆澧冪殑source map, 鍙互灏嗗叾璁剧疆涓篺alse 浠ュ姞閫熺敓浜х幆澧冩瀯寤� devServer: { proxy: { - "/api/base": { - target: "http://192.168.20.119:8002", - ws: true, - changeOrigin: true - }, - "/api/salesLeads": { - target: "http://192.168.20.119:8002", - ws: true, - changeOrigin: true - }, - "/api/followRecord": { - target: "http://192.168.20.119:8002", - ws: true, - changeOrigin: true - }, - "/api-s": { - target: "http://192.168.20.119:9081", - ws: true, - changeOrigin: true - }, "/api": { - target: "http://192.168.20.119:8002", + target: "http://192.168.20.119:8002", // http://192.168.20.119:8002 http://fai365.com:30150/ ws: true, changeOrigin: true } - // "/api-s": { - // target: "http://192.168.20.113:9081", - // ws: true, - // changeOrigin: true, - // }, } }, transpileDependencies: [ -- Gitblit v1.8.0