From b5acca92bd0794c24310d15c6fba8433d08119c9 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期三, 11 十月 2023 15:27:09 +0800
Subject: [PATCH] feat: 销售机会报价单销售总单销售子单 编辑弹窗调整表单编号位置, 更换适配新的编码组件
---
src/views/sales/masterOrder/AddMasterOrderDialog.vue | 183 ++++++++++++++++++++++++++++++---------------
1 files changed, 120 insertions(+), 63 deletions(-)
diff --git a/src/views/sales/masterOrder/AddMasterOrderDialog.vue b/src/views/sales/masterOrder/AddMasterOrderDialog.vue
index 3040d17..462e94e 100644
--- a/src/views/sales/masterOrder/AddMasterOrderDialog.vue
+++ b/src/views/sales/masterOrder/AddMasterOrderDialog.vue
@@ -13,7 +13,7 @@
:model="editConfig.infomation"
:rules="rules"
label-position="right"
- label-width="308px"
+ label-width="120px"
size="mini"
>
<!-- 淇℃伅 -->
@@ -22,27 +22,55 @@
<div v-if="isUnflod" class="basic-info-title">鍩烘湰淇℃伅</div>
<div class="basic-info-view">
<el-row>
+<!-- <el-col v-if="isUnflod" :span="12">-->
+<!-- <el-form-item label="鍗曟嵁缂栧彿" prop="number">-->
+<!-- <el-input v-model="editConfig.infomation.number"></el-input>-->
+<!-- </el-form-item>-->
+<!-- </el-col>-->
+ <el-col v-if="isUnflod" :span="12">
+ <el-form-item label="鍗曟嵁缂栧彿" prop="number">
+ <WordInput
+ v-if="codenumer && (explain != '' || isIdDisabled)&&method == 0"
+ :codenumer="codenumer"
+ :sum="sum"
+ :disabled="editConfig.infomation.id || isIdDisabled"
+ :inputValue="inputValue"
+ @codeList="codeList"
+ />
+ <span v-else-if="method == 0" style="color: #f56c6c"
+ >璇蜂紭鍏堥厤缃紪鐮佽鑼�
+ <el-button type="text" @click="numberClick">
+ 閰嶇疆瑙勮寖
+ </el-button
+ ></span
+ >
+ <span v-else>鑷姩鐢熸垚</span>
+ </el-form-item>
+ </el-col>
<el-col :span="12">
<el-form-item label="瀹㈡埛鍚嶇О" prop="client_name">
<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">
- <i class="el-icon-edit-outline" title="娓呴櫎"></i>
+ <div
+ v-if="editConfig.infomation.client_name && editConfig.infomation.client_name.length > 0"
+ class="common-select-btn"
+ @click="clearupClient('client')"
+ >
+ <i class="el-icon-remove-outline" title="娓呴櫎"></i>
</div>
</div>
- </el-form-item>
- </el-col>
- <el-col v-if="isUnflod" :span="12">
- <el-form-item label="鍗曟嵁缂栧彿" prop="number">
- <el-input v-model="editConfig.infomation.number"></el-input>
</el-form-item>
</el-col>
<el-col v-if="isUnflod" :span="12">
@@ -51,7 +79,7 @@
v-model="editConfig.infomation.member_id"
placeholder="璇烽�夋嫨"
size="mini"
- style="width: 63%"
+ style="width: 100%"
>
<el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
</el-option>
@@ -63,6 +91,7 @@
<el-date-picker
v-model="editConfig.infomation.start_time"
value-format="yyyy-MM-dd HH:mm:ss"
+ style="width: 100%"
type="datetime"
placeholder="閫夋嫨鏃ユ湡"
>
@@ -75,6 +104,7 @@
v-model="editConfig.infomation.end_time"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetime"
+ style="width: 100%"
placeholder="閫夋嫨鏃ユ湡"
>
</el-date-picker>
@@ -88,7 +118,7 @@
:min="0"
:precision="2"
:controls="false"
- style="width: 25%; margin-right: 5px"
+ style="width: 100%"
></el-input-number>
</el-form-item>
</el-col>
@@ -147,8 +177,11 @@
import { getAllData } from "@/api/client/client"
import { getAddMasterOrder, getUpdateMasterOrder } from "@/api/sales/masterOrder"
import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
+import WordInput from "@/components/wordInput.vue";
+import codeMixin from "@/views/client/followupRecords/mixin/codeMixin";
export default {
name: "QuotationDialog",
+ mixins:[codeMixin],
props: {
editCommonConfig: {
type: Object,
@@ -161,7 +194,7 @@
}
}
},
- components: { SelectClientDialog },
+ components: {WordInput, SelectClientDialog },
computed: {
clientList() {
return this.$store.state.getClientName.clientList
@@ -169,7 +202,7 @@
},
data() {
return {
- dialogWidth: "80%",
+ dialogWidth: "50%",
editConfig: this.editCommonConfig,
rules: {
number: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
@@ -182,14 +215,34 @@
editVisible: false,
title: "",
infomation: {}
- }
+ },
+ clientId: this.editCommonConfig.infomation.client_id,
+ objCode: { name: "", page: 0, pageSize: 0, type: "閿�鍞�诲崟缂栫爜",codeStandID:'' },
}
},
created() {
this.$store.dispatch("geClient")
this.getCommonData()
+ this.formInfo()
+ },
+ watch:{
+ 'editCommonConfig.visible'(val){
+ if(val){
+ this.formInfo()
+ }
+ },
+ 'editCommonConfig.infomation.codeStandID'(val){
+ this.formInfo()
+ }
},
methods: {
+ formInfo(){
+ this.objCode.codeStandID = ''
+ if(this.editConfig.infomation.codeStandID){
+ this.objCode.codeStandID = this.editConfig.infomation.codeStandID;
+ }
+ this.getRCodeStandardList();
+ },
getCommonData() {
getAllData()
.then((res) => {
@@ -207,37 +260,23 @@
const params = this.saveParams()
console.log(params)
if (this.editConfig.title === "鏂板缓") {
- getAddMasterOrder(params)
- .then((res) => {
- console.log(res)
- this.editConfig.visible = false
- if (res.code === 200) {
- this.$message({
- message: "娣诲姞鎴愬姛",
- type: "success"
- })
- this.$parent.getData()
- }
- })
- .catch((err) => {
- console.log(err)
- })
+ getAddMasterOrder(params).then((res) => {
+ console.log(res)
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ this.$message.success("娣诲姞鎴愬姛")
+ this.$parent.getData()
+ }
+ })
} else {
- getUpdateMasterOrder(params)
- .then((res) => {
- console.log(res)
- this.editConfig.visible = false
- if (res.code === 200) {
- this.$message({
- message: "缂栬緫鎴愬姛",
- type: "success"
- })
- this.$parent.getData()
- }
- })
- .catch((err) => {
- console.log(err)
- })
+ getUpdateMasterOrder(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")
@@ -249,21 +288,26 @@
let data = this.editConfig.infomation
let params = {
id: this.editConfig.title === "鏂板缓" ? 0 : data.id,
- client_id: parseInt(data.client_id) || 0,
+ client_id: this.clientId || 0,
end_time: data.end_time || "",
member_id: data.member_id || 0,
- money: parseFloat(data.money) || "0",
+ money: data.money || 0,
number: data.number || "",
- start_time: data.start_time || ""
+ start_time: data.start_time || "",
+ codeStandID:data.ID,
+ codeRule:this.codeRule,
}
return params
},
handleClose() {
this.editConfig.visible = false
},
- // 閫夋嫨瀹㈡埛鐩稿叧鏂规硶
- querySearchAsync(queryString, cb) {
- var restaurants = this.clientList
+ // 閫夋嫨鐢ㄦ埛鐩稿叧鏂规硶
+ querySearchAsync(queryString, cb, value) {
+ var restaurants = []
+ if (value === "client") {
+ restaurants = this.clientList
+ }
var results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants
cb(results)
},
@@ -272,21 +316,31 @@
return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
}
},
- handleSelectClient(item) {
- this.editConfig.infomation.client_id = item.id
+ handleSelectClient(value, item) {
+ if (value === "client") {
+ this.clientId = item.id
+ }
},
- selClientClick() {
- this.editSelectClientConfig.editVisible = true
+ selClientClick(value) {
+ if (value === "client") {
+ this.editSelectClientConfig.editVisible = true
+ }
},
- selClient(row) {
- console.log(row)
- this.editConfig.infomation.client_name = row.name
- this.editConfig.infomation.client_id = row.id
+ selClient(row, value) {
+ if (value === "client") {
+ this.editConfig.infomation.client_name = row.name
+ this.clientId = row.id
+ }
},
// 娓呴櫎宸查�夋嫨鐢ㄦ埛
- clearupClient() {
- this.editConfig.infomation.client_name = ""
- this.editConfig.infomation.client_id = 0
+ clearupClient(value) {
+ if (value === "client") {
+ this.editConfig.infomation.client_name = ""
+ this.clientId = 0
+ } else if (value === "contact") {
+ this.editConfig.infomation.contact_name = ""
+ this.contactId = 0
+ }
},
// 娣诲姞闄勪欢
addAnnexClick() {},
@@ -330,6 +384,9 @@
font-size: 18px;
cursor: pointer;
}
+ .el-autocomplete{
+ flex: 1;
+ }
}
}
.address-view {
--
Gitblit v1.8.0