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 | 104 ++++++++++++++++++++++++++--------------------------
1 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/src/views/other/payment/saleInvoice/addSaleInvoice.vue b/src/views/other/payment/saleInvoice/addSaleInvoice.vue
index 44889e2..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,25 +152,25 @@
}
"
value-key="number"
- :disabled="this.editCommonConfig.infomation.id?true:false"
+ :disabled="this.editCommonConfig.infomation.id ? true : false"
@select="handleSelectClient('serviceContract', $event)"
style="width: 100%"
></el-autocomplete>
- <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>
+ <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>
@@ -187,12 +185,12 @@
}
"
value-key="number"
- :disabled="this.editCommonConfig.infomation.id?true:false"
+ :disabled="this.editCommonConfig.infomation.id ? true : false"
@select="handleSelectClient('contract', $event)"
style="width: 100%"
></el-autocomplete>
- <template v-if='!this.editCommonConfig.infomation.id'>
- <div class="common-select-btn" @click="selClientClick('contract')">
+ <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
@@ -433,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" }],
@@ -475,7 +473,9 @@
clientId: this.editCommonConfig.infomation.client_id,
SalesDetailsId: this.editCommonConfig.infomation.id,
serviceContractId: this.editCommonConfig.infomation.id,
- tableData: []
+ tableData: [],
+ productId: 1,
+ isNoProduct: true
}
},
created() {
@@ -484,23 +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()
}
- },
+ }
},
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) => {
@@ -511,26 +511,26 @@
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)
+ this.$set(this.editConfig.infomation, "serviceContract_Number", this.editCommonConfig.infomation.keyword)
+ this.$set(this.editConfig.infomation, "contract_number", this.editCommonConfig.infomation.keyword)
},
async getInvoiceTypeList() {
- const res=await getInvoiceTypeList()
- if (res.code == 200) {
- this.invoiceTypeOptions = res.data.data
- }
+ const res = await getInvoiceTypeList()
+ if (res.code == 200) {
+ this.invoiceTypeOptions = res.data.data
+ }
},
async getInvoiceStatusList() {
- const res=await getInvoiceStatusList()
- if (res.code == 200) {
- this.invoiceStatusOptions = res.data.data
- }
+ const res = await getInvoiceStatusList()
+ if (res.code == 200) {
+ this.invoiceStatusOptions = res.data.data
+ }
},
async getCourierCompanyList() {
- const res=await getCourierCompanyList()
- if (res.code == 200) {
- this.courierCompanyOptions = res.data.data
- }
+ const res = await getCourierCompanyList()
+ if (res.code == 200) {
+ this.courierCompanyOptions = res.data.data
+ }
},
// 淇濆瓨
saveClick(formName) {
@@ -590,7 +590,7 @@
products: this.tableData,
sourceId: this.editConfig.sourceType === 1 ? this.SalesDetailsId : this.serviceContractId,
sourceType: this.editConfig.sourceType,
- number:data.number || "",
+ number: data.number || "",
subject: data.subject || "",
taxpayerIdNumber: data.taxpayerIdNumber || ""
}
--
Gitblit v1.8.0