From 72f6f5abb7d6a90c9edfb69db63907ef3e17ef03 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期三, 22 十一月 2023 11:31:27 +0800
Subject: [PATCH] 销售明细单添加确认订单前确认是否选择项目
---
src/views/sales/salesDetails/AddSalesDetailsDialog.vue | 9 --
src/views/sales/contractManage/index.vue | 7 +-
src/views/sales/salesDetails/index.vue | 159 +++++++++++++++++++++++++++++++++++++++++++++++++----
3 files changed, 152 insertions(+), 23 deletions(-)
diff --git a/src/views/sales/contractManage/index.vue b/src/views/sales/contractManage/index.vue
index 8976ada..1866304 100644
--- a/src/views/sales/contractManage/index.vue
+++ b/src/views/sales/contractManage/index.vue
@@ -113,7 +113,8 @@
{ label: "鍚堝悓鐘舵��", prop: "serviceContractStatus_name", min: 100 },
{ label: "鍒涘缓鏃堕棿", prop: "created_at" }
],
- showCol: ["鍗曟嵁缂栧彿", "璐熻矗浜�", "瀹㈡埛鍚嶇О", "鍚堝悓鐘舵��", "鍒涘缓鏃堕棿"]
+ showCol: ["鍗曟嵁缂栧彿", "璐熻矗浜�", "瀹㈡埛鍚嶇О", "鍚堝悓鐘舵��", "鍒涘缓鏃堕棿"],
+ keyword:''
}
},
created() {
@@ -160,7 +161,7 @@
async getData() {
this.loading = true
await getContractList({
- search_map: this.search_map,
+ keyword:this.keyword,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
})
@@ -195,7 +196,7 @@
},
// 鎼滅储
onFilterSearch(searchText) {
- this.search_map.number = searchText ?? ""
+ this.keyword=searchText
this.pagerOptions.currPage = 1
this.getData()
},
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index 48f7a0b..30c0c34 100644
--- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
+++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -659,13 +659,6 @@
} else {
const params = this.saveParams()
if (this.editConfig.title === "鏂板缓") {
- if(params.projectId!==0){
- sendSalesDetailsToApsProject({...params,member:this.thatMember}).then((res)=>{
- if(res.code===200){
- this.$message.success("鎴愬姛鎺ㄩ�佽嚦aps绯荤粺")
- }
- })
- }
getAddSalesDetails(params).then((res) => {
console.log(res)
this.editConfig.visible = false
@@ -721,7 +714,7 @@
quotationId: this.quotationId,
deliverType: data.deliverType || 0,
status: 1,
- projectId:data.projectId||0
+ projectId:data.projectId||''
}
let params = {}
if (this.editConfig.title === "鏂板缓") {
diff --git a/src/views/sales/salesDetails/index.vue b/src/views/sales/salesDetails/index.vue
index 5b8ea21..ca149e8 100644
--- a/src/views/sales/salesDetails/index.vue
+++ b/src/views/sales/salesDetails/index.vue
@@ -102,6 +102,36 @@
</div>
</div>
</div>
+ <!-- 纭鎻愪氦-閫夋嫨椤圭洰 -->
+ <el-dialog
+ title="璇烽�夋嫨椤圭洰"
+ :visible.sync="projectListShow"
+ width="40%"
+ :before-close="handleClose">
+ <el-form
+ label-width="100px"
+ class="demo-ruleForm"
+ ref="form"
+ :rules="rules"
+ :model="projects"
+ >
+ <el-form-item label="閫夋嫨椤圭洰" prop="projectId">
+ <el-select
+ v-model="projects.projectId"
+ placeholder="璇烽�夋嫨"
+ size="mini"
+ style="width: 100%"
+ >
+ <el-option v-for="item in projectList" :key="item.projectId" :label="item.projectName" :value="item.projectId">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-form>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="projectListShow = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="affirmCommitBtn">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
<!-- 鏂板缓/缂栬緫 -->
<AddSalesDetailsDialog
v-if="editConfig.visible"
@@ -125,7 +155,10 @@
getProductInventoryInfo,
getProductOrderInfo,
updateStatus,
- createOperation
+ createOperation,
+ getProjectList,
+ getUpdateSalesDetails,
+ sendSalesDetailsToApsProject
} from "@/api/sales/salesDetails"
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
import DetailSpecification from "@/views/sales/salesDetails/DetailSpecification"
@@ -257,7 +290,16 @@
showInventoryCol: ["浜у搧缂栧彿", "浜у搧鍚嶇О", "璁㈠崟鏁伴噺", "浠撳簱", "鍦ㄥ簱鏁伴噺", "鍙敤搴撳瓨", "鍗曚綅"],
makeColumn: makeColumn,
showMakeCol: ["鐢熶骇璁㈠崟", "浜у搧鍚嶇О", "璁㈠崟鐘舵��", "宸ュ崟缂栧彿", "宸ュ崟鐘舵��", "璁″垝寮�濮嬫椂闂�", "璁″垝缁撴潫鏃堕棿"],
- selectRow: {}
+ selectRow: {},
+ projectList:[],
+ projectListShow:false,
+ projects:{
+ projectId:'',
+ },
+ thatRow:{},
+ rules: {
+ projectId: [{ required: true, message: "璇烽�夋嫨椤圭洰", trigger: "change" }],
+ },
}
},
created() {
@@ -270,6 +312,7 @@
this.keywordType = this.addConfig.keywordType
}
this.getData()
+ this.getProjectList()
},
methods: {
setTable() {
@@ -446,17 +489,28 @@
},
// 纭鎻愪氦
async submitClick(row) {
- console.log(row, "纭鎻愪氦")
- let params = {
- ...row,
- status: 2
- }
- await createOperation(params).then((res) => {
- if (res.code == 200) {
- this.$message.success("纭鎻愪氦鎴愬姛")
- this.getData()
+ this.thatRow=row
+ if(row.projectId==""){
+ this.$message.error("璇峰厛濉啓椤圭洰淇℃伅")
+ this.projectListShow=true
+ }else{
+ let params = {
+ ...row,
+ status: 2
}
- })
+ await createOperation(params).then((res) => {
+ if (res.code == 200) {
+ this.$message.success("纭鎻愪氦鎴愬姛")
+ this.getData()
+ this.thatRow.status=2
+ sendSalesDetailsToApsProject(this.thatRow).then((res)=>{
+ if(res.code===200){
+ this.$message.success("鎴愬姛鎺ㄩ�佽嚦aps绯荤粺")
+ }
+ })
+ }
+ })
+ }
},
// 鍏抽棴
closeClick(row) {
@@ -578,6 +632,83 @@
} else if (this.TabsIndex == 2) {
this.getProductOrderInfo(this.selectRow.number)
}
+ },
+ // 鑾峰彇椤圭洰鍒楄〃
+ async getProjectList(){
+ await getProjectList({
+ page: 1,
+ pageSize: 100,
+ }).then((res) => {
+ console.log(res.data,"椤圭洰鍒楄〃淇℃伅")
+ this.projectList=res.data
+ })
+ },
+ handleClose(done) {
+ done()
+ },
+
+ saveParams() {
+ let params={
+ address: this.thatRow.address || "",
+ addressee: this.thatRow.addressee || "",
+ clientId: this.thatRow.clientId || 0,
+ conditions: this.thatRow.conditions || "",
+ deliveryDate: this.thatRow.deliveryDate || "",
+ memberId: this.thatRow.memberId || 0,
+ number: this.thatRow.number || "",
+ phone: this.thatRow.phone || "",
+ products: this.thatRow.products,
+ remark: this.thatRow.remark || "",
+ saleChanceId: this.thatRow.saleChanceId || 0,
+ saleType: this.thatRow.saleType || 0,
+ signTime: this.thatRow.signTime || "",
+ wechatOrderStatus: this.thatRow.wechatOrderStatus || 0,
+ logisticCompany: this.thatRow.logisticCompany || "",
+ logisticCost: this.thatRow.logisticCost || 0,
+ logisticNumber: this.thatRow.logisticNumber || "",
+ quotationId: this.thatRow.quotationId,
+ deliverType: this.thatRow.deliverType || 0,
+ status: this.thatRow.deliverType,
+ projectId:this.projects.projectId||0
+ }
+ return params
+ },
+ // 纭鎻愪氦
+ affirmCommitBtn(){
+ let params=this.saveParams()
+ this.$refs['form'].validate((valid) => {
+ if(valid){
+ console.log()
+ this.projectListShow=false
+ getUpdateSalesDetails({
+ id:this.thatRow.id,
+ salesDetails:params
+ }).then((res) => {
+ console.log(res)
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ let params2 = {
+ ...this.thatRow,
+ status: 2
+ }
+ createOperation(params2).then((res) => {
+ if (res.code == 200) {
+ this.$message.success("鎻愪氦鎴愬姛")
+ this.getData()
+ this.thatRow.status=2
+ sendSalesDetailsToApsProject(this.thatRow).then((res)=>{
+ if(res.code===200){
+ this.$message.success("鎴愬姛鎺ㄩ�佽嚦aps绯荤粺")
+ }
+ })
+ }
+ })
+ }
+ }).catch((err)=>{
+ this.$message.error(`缂栬緫澶辫触:${err}`)
+ })
+ }
+ })
}
}
}
@@ -679,4 +810,8 @@
.bgcWhite {
background: #fff !important;
}
+.el-form-item{
+ width: 80%;
+ margin: 20px auto;
+}
</style>
--
Gitblit v1.8.0