From 75e27a973b76fa78ff12b96b503487c3d7e33688 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 27 十二月 2023 16:06:13 +0800
Subject: [PATCH] Merge branch 'wn' of http://192.168.5.5:10010/r/web/crm-web into dev
---
src/views/other/payment/saleInvoice/addSaleInvoice.vue | 134 +++++++++++++++++++++-----------------------
1 files changed, 65 insertions(+), 69 deletions(-)
diff --git a/src/views/other/payment/saleInvoice/addSaleInvoice.vue b/src/views/other/payment/saleInvoice/addSaleInvoice.vue
index 818aed8..15b6399 100644
--- a/src/views/other/payment/saleInvoice/addSaleInvoice.vue
+++ b/src/views/other/payment/saleInvoice/addSaleInvoice.vue
@@ -28,16 +28,14 @@
<el-input
v-if="
editConfig.title == '缂栬緫' ||
- (editConfig.title == '鏂板缓' &&
- codenumer &&
- (explain != '' || isIdDisabled))
+ (editConfig.title == '鏂板缓' && codenumer && (explain != '' || isIdDisabled))
"
:disabled="editConfig.title == '缂栬緫'"
v-model="editConfig.infomation.number"
placeholder="璇疯緭鍏ョ紪鐮�"
>
</el-input>
- <span v-else-if="editConfig.title == '鏂板缓'" style="color: #f56c6c"
+ <span v-else-if="editConfig.title == '鏂板缓'" style="color: #f56c6c"
>璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span
>
<!-- <WordInput
@@ -63,7 +61,7 @@
<el-input v-model="editConfig.infomation.subject" style="width: 100%"></el-input>
</el-form-item>
</el-col>
-
+
<el-col :span="12">
<el-form-item label="瀹㈡埛鍚嶇О" prop="client_name">
<div class="custom-name">
@@ -154,22 +152,25 @@
}
"
value-key="number"
+ :disabled="this.editCommonConfig.infomation.id ? true : false"
@select="handleSelectClient('serviceContract', $event)"
style="width: 100%"
></el-autocomplete>
- <div class="common-select-btn" @click="selClientClick('serviceContract')">
- <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
- </div>
- <div
- v-if="
- editConfig.infomation.serviceContract_Number &&
- editConfig.infomation.serviceContract_Number.length > 0
- "
- class="common-select-btn"
- @click="clearupClient('serviceContract')"
- >
- <i class="el-icon-remove-outline" title="娓呴櫎"></i>
- </div>
+ <template v-if="!this.editCommonConfig.infomation.id">
+ <div class="common-select-btn" @click="selClientClick('serviceContract')">
+ <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
+ </div>
+ <div
+ v-if="
+ editConfig.infomation.serviceContract_Number &&
+ editConfig.infomation.serviceContract_Number.length > 0
+ "
+ class="common-select-btn"
+ @click="clearupClient('serviceContract')"
+ >
+ <i class="el-icon-remove-outline" title="娓呴櫎"></i>
+ </div>
+ </template>
</div>
</el-form-item>
</el-col>
@@ -177,26 +178,29 @@
<el-form-item label="鍚堝悓璁㈠崟">
<div class="custom-name">
<el-autocomplete
- v-model="editConfig.infomation.number"
+ v-model="editConfig.infomation.contract_number"
:fetch-suggestions="
(queryString, callback) => {
querySearchAsync(queryString, callback, 'contract')
}
"
value-key="number"
+ :disabled="this.editCommonConfig.infomation.id ? true : false"
@select="handleSelectClient('contract', $event)"
style="width: 100%"
></el-autocomplete>
- <div class="common-select-btn" @click="selClientClick('contract')">
- <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
- </div>
- <div
- v-if="editConfig.infomation.number && editConfig.infomation.number.length > 0"
- class="common-select-btn"
- @click="clearupClient('contract')"
- >
- <i class="el-icon-remove-outline" title="娓呴櫎"></i>
- </div>
+ <template v-if="!this.editCommonConfig.infomation.id">
+ <div class="common-select-btn" @click="selClientClick('contract')">
+ <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
+ </div>
+ <div
+ v-if="editConfig.infomation.contract_number && editConfig.infomation.contract_number.length > 0"
+ class="common-select-btn"
+ @click="clearupClient('contract')"
+ >
+ <i class="el-icon-remove-outline" title="娓呴櫎"></i>
+ </div>
+ </template>
</div>
</el-form-item>
</el-col>
@@ -427,7 +431,7 @@
dialogWidth: "50%",
editConfig: this.editCommonConfig,
rules: {
- number: [{ required: true, validator: this.validateCheckCode, trigger: ["change",'blur' ] }],
+ number: [{ required: true, validator: this.validateCheckCode, trigger: ["change", "blur"] }],
subject: [{ required: true, message: "璇疯緭鍏ヤ富棰�", trigger: "blur" }],
client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: "change" }],
invoiceTypeId: [{ required: true, message: "璇烽�夋嫨绁ㄦ嵁绫诲瀷", trigger: "change" }],
@@ -467,9 +471,11 @@
infomation: {}
},
clientId: this.editCommonConfig.infomation.client_id,
- SalesDetailsId: this.editCommonConfig.infomation.SalesDetailsId,
+ SalesDetailsId: this.editCommonConfig.infomation.id,
serviceContractId: this.editCommonConfig.infomation.id,
- tableData: []
+ tableData: [],
+ productId: 1,
+ isNoProduct: true
}
},
created() {
@@ -478,26 +484,23 @@
this.$store.dispatch("geSalesDetails")
this.setTableForm()
this.getCommonData()
- this.formInfo();
+ this.formInfo()
},
- watch:{
- 'editCommonConfig.visible'(val){
- if(val){
+ watch: {
+ "editCommonConfig.visible"(val) {
+ if (val) {
this.formInfo()
}
- },
- 'editCommonConfig.infomation.codeStandID'(){
- this.formInfo()
}
},
methods: {
- formInfo(){
- this.objCode.type='閿�鍞彂绁ㄧ紪鐮�'
- this.objCode.codeStandID = ''
- if(this.editConfig.infomation.codeStandID){
- this.objCode.codeStandID = this.editConfig.infomation.codeStandID;
+ formInfo() {
+ this.objCode.type = "閿�鍞彂绁ㄧ紪鐮�"
+ this.objCode.codeStandID = ""
+ if (this.editConfig.infomation.codeStandID) {
+ this.objCode.codeStandID = this.editConfig.infomation.codeStandID
}
- this.getRCodeStandardList();
+ this.getRCodeStandardList()
},
getCommonData() {
getAllData().then((res) => {
@@ -508,38 +511,30 @@
this.getInvoiceTypeList()
this.getInvoiceStatusList()
this.getCourierCompanyList()
+ this.$set(this.editConfig.infomation, "serviceContract_Number", this.editCommonConfig.infomation.keyword)
+ this.$set(this.editConfig.infomation, "contract_number", this.editCommonConfig.infomation.keyword)
},
async getInvoiceTypeList() {
- await getInvoiceTypeList().then((res) => {
- console.log("绁ㄦ嵁绫诲瀷")
- console.log(res.data)
- if (res.data.code === 200) {
- this.invoiceTypeOptions = res.data.data.data
- }
- })
+ const res = await getInvoiceTypeList()
+ if (res.code == 200) {
+ this.invoiceTypeOptions = res.data.data
+ }
},
async getInvoiceStatusList() {
- await getInvoiceStatusList().then((res) => {
- console.log("绁ㄦ嵁鐘舵��")
- console.log(res.data)
- if (res.data.code === 200) {
- this.invoiceStatusOptions = res.data.data.data
- }
- })
+ const res = await getInvoiceStatusList()
+ if (res.code == 200) {
+ this.invoiceStatusOptions = res.data.data
+ }
},
async getCourierCompanyList() {
- await getCourierCompanyList().then((res) => {
- console.log("鐗╂祦鍏徃")
- console.log(res.data)
- if (res.data.code === 200) {
- this.courierCompanyOptions = res.data.data.data
- }
- })
+ const res = await getCourierCompanyList()
+ if (res.code == 200) {
+ this.courierCompanyOptions = res.data.data
+ }
},
// 淇濆瓨
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++) {
@@ -595,6 +590,7 @@
products: this.tableData,
sourceId: this.editConfig.sourceType === 1 ? this.SalesDetailsId : this.serviceContractId,
sourceType: this.editConfig.sourceType,
+ number: data.number || "",
subject: data.subject || "",
taxpayerIdNumber: data.taxpayerIdNumber || ""
}
@@ -653,7 +649,7 @@
this.editConfig.infomation.serviceContract_Number = row.number
this.serviceContractId = row.id
} else if (value === "contract") {
- this.editConfig.infomation.number = row.number
+ this.editConfig.infomation.contract_number = row.number
this.SalesDetailsId = row.id
}
},
@@ -666,7 +662,7 @@
this.editConfig.infomation.serviceContract_Number = ""
this.serviceContractId = 0
} else if (value === "contract") {
- this.editConfig.infomation.number = ""
+ this.editConfig.infomation.contract_number = ""
this.SalesDetailsId = 0
}
},
--
Gitblit v1.8.0