From a63d71177a2899b01da37e5bfc2d498bec5f80be Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 17 十月 2023 15:10:13 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into zhengwenfeng/modify-style
---
src/views/sales/subOrder/AddSubOrderDialog.vue | 129 ++++++++++++++++++++++++++++++++++++------
1 files changed, 109 insertions(+), 20 deletions(-)
diff --git a/src/views/sales/subOrder/AddSubOrderDialog.vue b/src/views/sales/subOrder/AddSubOrderDialog.vue
index 8aa88ed..55628d2 100644
--- a/src/views/sales/subOrder/AddSubOrderDialog.vue
+++ b/src/views/sales/subOrder/AddSubOrderDialog.vue
@@ -9,11 +9,12 @@
custom-class="iframe-dialog"
>
<el-form
+ v-if="refreshFlag"
ref="form"
:model="editConfig.infomation"
:rules="rules"
label-position="right"
- label-width="308px"
+ label-width="100px"
size="mini"
>
<!-- 淇℃伅 -->
@@ -22,6 +23,22 @@
<div class="basic-info-title">鍩烘湰淇℃伅</div>
<div class="basic-info-view">
<el-row>
+ <el-col :span="12">
+ <el-form-item label="鍗曟嵁缂栧彿" prop="number">
+ <WordInput
+ v-if="codenumer && (explain != '' || isIdDisabled) && method == 0"
+ :codenumer="codenumer"
+ :sum="sum"
+ :disabled="editConfig.title !== '鏂板缓' || 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>{{ editConfig.title === "鏂板缓" ? "鑷姩鐢熸垚" : editConfig.infomation.number }}</span>
+ </el-form-item>
+ </el-col>
<el-col :span="12">
<el-form-item label="瀹㈡埛鍚嶇О" prop="client_name">
<div class="custom-name">
@@ -43,16 +60,12 @@
class="common-select-btn"
@click="clearupClient('client')"
>
- <i class="el-icon-edit-outline" title="娓呴櫎"></i>
+ <i class="el-icon-remove-outline" title="娓呴櫎"></i>
</div>
</div>
</el-form-item>
</el-col>
- <el-col :span="12">
- <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="master_order_number">
<div class="custom-name">
@@ -65,19 +78,22 @@
"
value-key="number"
@select="handleSelectClient('master', $event)"
+ placeholder="璇峰厛閫夋嫨瀹㈡埛鍚嶇О"
+ :disabled="isAddMaster"
></el-autocomplete>
- <div class="common-select-btn" @click="selClientClick('master')">
+ <div v-if="!isAddMaster" class="common-select-btn" @click="selClientClick('master')">
<i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
</div>
<div
v-if="
editConfig.infomation.master_order_number &&
- editConfig.infomation.master_order_number.length > 0
+ editConfig.infomation.master_order_number.length > 0 &&
+ !isAddMaster
"
class="common-select-btn"
@click="clearupClient('master')"
>
- <i class="el-icon-edit-outline" title="娓呴櫎"></i>
+ <i class="el-icon-remove-outline" title="娓呴櫎"></i>
</div>
</div>
</el-form-item>
@@ -88,7 +104,7 @@
v-model="editConfig.infomation.memberId"
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>
@@ -174,10 +190,14 @@
import { getAddSubOrder, getUpdateSubOrder } from "@/api/sales/subOrder"
import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
+import WordInput from "@/components/wordInput.vue"
+import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
+import { getMasterOrderList } from "@/api/sales/masterOrder"
export default {
name: "SubOrderDialog",
- components: { CommonFormTableView, SelectClientDialog, SelectCommonDialog },
+ mixins: [codeMixin],
+ components: { WordInput, CommonFormTableView, SelectClientDialog, SelectCommonDialog },
props: {
editCommonConfig: {
type: Object,
@@ -193,17 +213,20 @@
computed: {
clientList() {
return this.$store.state.getClientName.clientList
- },
- masterOrderList() {
- return this.$store.state.getClientName.masterOrderList
}
+ // masterOrderList() {
+ // return this.$store.state.getClientName.masterOrderList
+ // }
},
data() {
return {
- dialogWidth: "80%",
+ refreshFlag: true,
+ dialogWidth: "50%",
editConfig: this.editCommonConfig,
rules: {
number: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ master_order_number: [{ required: true, message: "璇烽�夋嫨鎴栧垱寤洪攢鍞�诲崟", trigger: "blur" }],
+ client_name: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
memberId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }]
},
memberOptions: [],
@@ -239,16 +262,37 @@
masterId: this.editCommonConfig.infomation.masterOrderId,
tableData: [],
productId: 1,
- addProductArr: []
+ addProductArr: [],
+ objCode: { name: "", page: 0, pageSize: 0, type: "閿�鍞瓙鍗曠紪鐮�", codeStandID: "" },
+ isAddMaster: true,
+ masterOrderList: []
}
},
created() {
this.$store.dispatch("geClient")
- this.$store.dispatch("geMaster")
+ // this.$store.dispatch("geMaster")
this.setTableForm()
this.getCommonData()
+ this.formInfo()
+ },
+ watch: {
+ "editConfig.visible"(val) {
+ if (val) {
+ this.formInfo()
+ }
+ },
+ "editConfig.infomation.codeStandID"() {
+ 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) => {
@@ -269,9 +313,20 @@
}
})
},
+ /**
+ * 寮哄埗鍒锋柊form缁勪欢
+ * 澶栭儴鏇存敼琛ㄥ崟鍊间笉浼氳Е鍙戣〃鍗曟牎楠�,瀵艰嚧鍗充娇鏈夊�煎琚〃鍗曟牎楠岄樆濉炰綇
+ */
+ refresh() {
+ this.refreshFlag = false
+ requestAnimationFrame(() => {
+ this.refreshFlag = true
+ })
+ },
// 淇濆瓨
saveClick(formName) {
this.$refs[formName].validate((valid) => {
+ this.validateFormNumber()
if (valid) {
console.log(this.editConfig.infomation)
for (let i = 0; i < this.tableData.length; i++) {
@@ -321,12 +376,28 @@
masterOrderId: this.masterId || 0,
memberId: data.memberId || 0,
number: data.number || "",
- product: this.tableData
+ product: this.tableData,
+ codeStandID: data.ID,
+ codeRule: this.codeRule
}
return params
},
handleClose() {
this.editConfig.visible = false
+ },
+ // 鑾峰彇閿�鍞�诲崟
+ getMasterList(id) {
+ getMasterOrderList({
+ page: 0,
+ pageSize: 0,
+ search_map: {
+ client_id: id
+ }
+ }).then((res) => {
+ if (res.code == 200) {
+ this.masterOrderList = res.data.list
+ }
+ })
},
// 閫夋嫨瀹㈡埛鐩稿叧鏂规硶
querySearchAsync(queryString, cb, value) {
@@ -352,9 +423,15 @@
handleSelectClient(value, item) {
if (value === "client") {
this.clientId = item.id
+ this.isAddMaster = false
+ this.getMasterList(item.id)
+ this.editConfig.infomation.master_order_number = ""
+ this.masterId = 0
} else if (value === "master") {
+ this.editConfig.infomation.master_order_number = item.number
this.masterId = item.id
}
+ this.refresh()
},
selClientClick(value) {
if (value == "client") {
@@ -362,19 +439,24 @@
} else if (value == "master") {
this.editSelectMasterConfig.title = "閿�鍞�诲崟"
this.editSelectMasterConfig.editVisible = true
+ this.editSelectMasterConfig.clientId = this.clientId
this.editSelectMasterConfig.tableInfomation = [...this.masterOrderList]
}
},
selClient(row, value) {
- console.log(row)
if (value == "client") {
this.editConfig.infomation.client_name = row.name
this.editConfig.infomation.client_id = row.id
this.clientId = row.id
+ this.isAddMaster = false
+ this.getMasterList(row.id)
+ this.editConfig.infomation.master_order_number = ""
+ this.masterId = 0
} else if (value == "master") {
this.editConfig.infomation.master_order_number = row.number
this.masterId = row.id
}
+ this.refresh()
},
// 娓呴櫎宸查�夋嫨鐢ㄦ埛
clearupClient(value) {
@@ -382,10 +464,14 @@
this.editConfig.infomation.client_name = ""
this.editConfig.infomation.client_id = 0
this.clientId = 0
+ this.isAddMaster = true
+ this.editConfig.infomation.master_order_number = ""
+ this.masterId = 0
} else if (value == "master") {
this.editConfig.infomation.master_order_number = ""
this.masterId = 0
}
+ this.refresh()
},
// 娣诲姞闄勪欢
addAnnexClick() {},
@@ -498,6 +584,9 @@
font-size: 18px;
cursor: pointer;
}
+ .el-autocomplete {
+ flex: 1;
+ }
}
}
.address-view {
--
Gitblit v1.8.0