From 02a1ab651bb79684cf0656bd6fad0611fe568b2b Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期四, 20 七月 2023 18:28:17 +0800
Subject: [PATCH] 服务模块相关接口联调
---
src/views/service/serviceContract/AddServiceContractDialog.vue | 174 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 105 insertions(+), 69 deletions(-)
diff --git a/src/views/service/serviceContract/AddServiceContractDialog.vue b/src/views/service/serviceContract/AddServiceContractDialog.vue
index 7a3568e..232dcb4 100644
--- a/src/views/service/serviceContract/AddServiceContractDialog.vue
+++ b/src/views/service/serviceContract/AddServiceContractDialog.vue
@@ -22,86 +22,99 @@
<div class="basic-info-view">
<el-row>
<el-col :span="12">
- <el-form-item label="瀹㈡埛鍚嶇О" prop="customName">
+ <el-form-item label="瀹㈡埛鍚嶇О" prop="clientId">
<div class="custom-name">
- <el-input v-model="editConfig.infomation.customName"></el-input>
+ <el-input v-model="editConfig.infomation.clientId"></el-input>
<div class="common-select-btn"><i class="el-icon-circle-plus-outline" title="閫夋嫨"></i></div>
<div class="common-select-btn"><i class="el-icon-edit" title="缂栬緫"></i></div>
</div>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鏈嶅姟鍚堝悓缂栧彿" prop="serviceContractNumber">
- <el-input v-model="editConfig.infomation.serviceContractNumber"></el-input>
+ <el-form-item label="鏈嶅姟鍚堝悓缂栧彿" prop="number">
+ <el-input v-model="editConfig.infomation.number"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="璐熻矗浜�" prop="owner">
- <el-select v-model="editConfig.infomation.owner" placeholder="璇烽�夋嫨" size="mini" style="width: 63%">
- <el-option v-for="item in ownerOptions" :key="item.value" :label="item.label" :value="item.value">
+ <el-form-item label="璐熻矗浜�" prop="memberId">
+ <el-select
+ v-model="editConfig.infomation.memberId"
+ placeholder="璇烽�夋嫨"
+ size="mini"
+ style="width: 63%"
+ >
+ <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鑱旂郴浜哄鍚�" prop="contactName">
+ <el-form-item label="鑱旂郴浜哄鍚�" prop="contactId">
<div class="custom-name">
- <el-input v-model="editConfig.infomation.contactName"></el-input>
+ <el-input v-model="editConfig.infomation.contactId"></el-input>
<div class="common-select-btn"><i class="el-icon-circle-plus-outline" title="閫夋嫨"></i></div>
<div class="common-select-btn"><i class="el-icon-edit" title="缂栬緫"></i></div>
</div>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="閿�鍞満浼�" prop="salesOpportunity">
+ <el-form-item label="閿�鍞満浼�" prop="saleChanceId">
<div class="custom-name">
- <el-input v-model="editConfig.infomation.salesOpportunity"></el-input>
+ <el-input v-model="editConfig.infomation.saleChanceId"></el-input>
<div class="common-select-btn"><i class="el-icon-circle-plus-outline" title="閫夋嫨"></i></div>
<div class="common-select-btn"><i class="el-icon-edit" title="缂栬緫"></i></div>
</div>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鍚堝悓璁㈠崟" prop="contractOrder">
+ <el-form-item label="鍚堝悓璁㈠崟" prop="contractId">
<div class="custom-name">
- <el-input v-model="editConfig.infomation.contractOrder"></el-input>
+ <el-input v-model="editConfig.infomation.contractId"></el-input>
<div class="common-select-btn"><i class="el-icon-circle-plus-outline" title="閫夋嫨"></i></div>
<div class="common-select-btn"><i class="el-icon-edit" title="缂栬緫"></i></div>
</div>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鎶ヤ环鍗�" prop="quotation">
+ <el-form-item label="鎶ヤ环鍗�" prop="quotationId">
<div class="custom-name">
- <el-input v-model="editConfig.infomation.quotation"></el-input>
+ <el-input v-model="editConfig.infomation.quotationId"></el-input>
<div class="common-select-btn"><i class="el-icon-circle-plus-outline" title="閫夋嫨"></i></div>
<div class="common-select-btn"><i class="el-icon-edit" title="缂栬緫"></i></div>
</div>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鍚堝悓绫诲瀷" prop="contractType">
- <CommonSelectView
- :common-value="editConfig.infomation.contractType"
- :common-options="contractTypeOptions"
- />
+ <el-form-item label="鍚堝悓绫诲瀷" prop="typeId">
+ <div class="common-select">
+ <el-select
+ v-model="editConfig.infomation.typeId"
+ placeholder="璇烽�夋嫨"
+ class="common-select-sel"
+ size="mini"
+ >
+ <el-option v-for="item in contractTypeOptions" :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-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="绛剧害鏃ユ湡" prop="signDate">
- <el-date-picker v-model="editConfig.infomation.signDate" type="date" placeholder="閫夋嫨鏃ユ湡">
+ <el-form-item label="绛剧害鏃ユ湡" prop="signTime">
+ <el-date-picker v-model="editConfig.infomation.signTime" type="date" placeholder="閫夋嫨鏃ユ湡">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鏈嶅姟寮�濮嬫棩鏈�" prop="startDate">
- <el-date-picker v-model="editConfig.infomation.startDate" type="date" placeholder="閫夋嫨鏃ユ湡">
+ <el-form-item label="鏈嶅姟寮�濮嬫棩鏈�" prop="startTime">
+ <el-date-picker v-model="editConfig.infomation.startTime" type="date" placeholder="閫夋嫨鏃ユ湡">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鏈嶅姟鍒版湡鏃�" prop="endDate">
- <el-date-picker v-model="editConfig.infomation.endDate" type="date" placeholder="閫夋嫨鏃ユ湡">
+ <el-form-item label="鏈嶅姟鍒版湡鏃�" prop="endTime">
+ <el-date-picker v-model="editConfig.infomation.endTime" type="date" placeholder="閫夋嫨鏃ユ湡">
</el-date-picker>
</el-form-item>
</el-col>
@@ -112,31 +125,44 @@
<div class="basic-info-view">
<el-row>
<el-col :span="12">
- <el-form-item label="鍚堝悓鐘舵��" prop="contractStatus">
- <CommonSelectView
- :common-value="editConfig.infomation.contractStatus"
- :common-options="contractStatusOptions"
- />
+ <el-form-item label="鍚堝悓鐘舵��" prop="statusId">
+ <div class="common-select">
+ <el-select
+ v-model="editConfig.infomation.statusId"
+ placeholder="璇烽�夋嫨"
+ class="common-select-sel"
+ size="mini"
+ >
+ <el-option
+ v-for="item in contractStatusOptions"
+ :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-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="搴旀湇鍔℃鏁�" prop="serviceNumber">
- <el-input v-model="editConfig.infomation.serviceNumber"></el-input>
+ <el-form-item label="搴旀湇鍔℃鏁�" prop="serviceTimes">
+ <el-input v-model="editConfig.infomation.serviceTimes"></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
<!-- 鏉℃涓庢潯浠� -->
<div class="basic-info-title">鏉℃涓庢潯浠�</div>
- <div class="address-view">
+ <div class="basic-info-view">
<el-row>
<el-col :span="24">
- <el-form-item label="鏉℃鍜屾潯绾�" prop="termsTreaty">
+ <el-form-item label="鏉℃鍜屾潯绾�" prop="terms">
<el-input
type="textarea"
:autosize="{ minRows: 4, maxRows: 6 }"
placeholder="璇疯緭鍏ュ唴瀹�"
- v-model="editConfig.infomation.termsTreaty"
+ v-model="editConfig.infomation.terms"
></el-input>
</el-form-item>
</el-col>
@@ -147,12 +173,12 @@
<div class="basic-info-view">
<el-row>
<el-col :span="24">
- <el-form-item label="澶囨敞" prop="notes">
+ <el-form-item label="澶囨敞" prop="remark">
<el-input
type="textarea"
:autosize="{ minRows: 2, maxRows: 4 }"
placeholder="璇疯緭鍏ュ唴瀹�"
- v-model="editConfig.infomation.notes"
+ v-model="editConfig.infomation.remark"
></el-input>
</el-form-item>
</el-col>
@@ -200,7 +226,7 @@
<CommonFormTableView :show-summary="showSummary" :product-table-list="productTableList" />
</div>
<!-- 閫夋嫨瀹℃壒娴佺▼ -->
- <div class="basic-info-title">閫夋嫨瀹℃壒娴佺▼</div>
+ <!-- <div class="basic-info-title">閫夋嫨瀹℃壒娴佺▼</div>
<div class="basic-info-view">
<el-row>
<el-col :span="20">
@@ -238,13 +264,13 @@
</el-form-item>
</el-col>
</el-row>
- </div>
+ </div> -->
</div>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" size="small" @click="editConfig.visible = false">淇濆苟鎻愪氦瀹℃壒</el-button>
- <el-button type="primary" size="small" @click="editConfig.visible = false">淇濆瓨</el-button>
+ <!-- <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>
</div>
</el-dialog>
@@ -252,10 +278,9 @@
</template>
<script>
-import CommonSelectView from "@/components/makepager/CommonSelectView"
import CommonFormTableView from "@/components/makepager/CommonFormTableView"
import { getAllData } from "@/api/client/client"
-import { getAddSubOrder, getUpdateSubOrder } from "@/api/sales/subOrder"
+import { getAddServiceContract, getUpdateServiceContract } from "@/api/serviceManage/serviceContract"
export default {
name: "AddServiceContractDialog",
props: {
@@ -270,7 +295,7 @@
}
}
},
- components: { CommonSelectView, CommonFormTableView },
+ components: { CommonFormTableView },
computed: {
searchCommonHeight() {
return this.$refs.searchCommonView.offsetHeight
@@ -281,20 +306,11 @@
dialogWidth: "80%",
editConfig: this.editCommonConfig,
rules: {
- serviceContractNumber: [{ required: true, message: "璇疯緭鍏ユ湇鍔″悎鍚岀紪鍙�", trigger: "blur" }],
- signDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- owner: [{ required: true, message: "璇烽�夋嫨璐熻矗浜�", trigger: "change" }]
+ number: [{ required: true, message: "璇疯緭鍏ユ湇鍔″悎鍚岀紪鍙�", trigger: "blur" }],
+ signTime: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+ memberId: [{ required: true, message: "璇烽�夋嫨璐熻矗浜�", trigger: "change" }]
},
- ownerOptions: [
- // 璐熻矗浜�
- { value: "1", label: "BOSS" },
- { value: "2", label: "Mia" },
- { value: "3", label: "璐㈠姟" },
- { value: "4", label: "甯傚満" },
- { value: "5", label: "绯荤粺绠＄悊鍛�" },
- { value: "6", label: "閿�鍞�" },
- { value: "7", label: "閿�鍞�荤洃" }
- ],
+ memberOptions: [],
contractTypeOptions: [], // 鍚堝悓绫诲瀷
contractStatusOptions: [], // 鍚堝悓鐘舵��
currencyOptions: [
@@ -320,7 +336,9 @@
getCommonData() {
getAllData()
.then((res) => {
- this.memberOptions = res.data.member
+ if (res.code === 200) {
+ this.memberOptions = res.data.member
+ }
})
.catch((err) => {
console.log(err)
@@ -334,7 +352,7 @@
const params = this.saveParams()
console.log(params)
if (this.editConfig.title === "鏂板缓") {
- getAddSubOrder(params)
+ getAddServiceContract(params)
.then((res) => {
console.log(res)
this.editConfig.visible = false
@@ -350,7 +368,7 @@
console.log(err)
})
} else {
- getUpdateSubOrder(params)
+ getUpdateServiceContract(params)
.then((res) => {
console.log(res)
this.editConfig.visible = false
@@ -376,11 +394,13 @@
let data = this.editConfig.infomation
let params = {
id: this.editConfig.title === "鏂板缓" ? 0 : data.id,
- clientId: data.clientId || 0,
- masterOrderId: data.masterOrderId || 0,
+ clientId: parseInt(data.clientId) || 0,
+ contactId: data.contactId || 0,
+ contractId: data.contractId || 0,
+ endTime: data.endTime || "",
memberId: data.memberId || 0,
number: data.number || "",
- product: [
+ products: [
{
amount: 0,
desc: "",
@@ -390,7 +410,16 @@
price: 0,
total: 0
}
- ]
+ ],
+ quotationId: data.quotationId || 0,
+ remark: data.remark || "",
+ saleChanceId: data.saleChanceId || 0,
+ serviceTimes: data.serviceTimes || 0,
+ signTime: data.signTime || "",
+ startTime: data.startTime || "",
+ statusId: data.statusId || 0,
+ terms: data.terms || "",
+ typeId: data.typeId || 0
}
return params
},
@@ -461,10 +490,17 @@
font-size: 18px;
}
}
- }
- .address-view {
- margin-top: 10px;
- padding-right: 40px;
+ .common-select {
+ display: flex;
+ .common-select-sel {
+ width: 270px;
+ }
+ .common-select-btn {
+ margin-left: 5px;
+ font-size: 16px;
+ cursor: pointer;
+ }
+ }
}
.annex-view {
display: flex;
--
Gitblit v1.8.0