From b136c0a80500d929897a8e24f920efad47e2e307 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 01 十一月 2023 19:03:01 +0800
Subject: [PATCH] 变更公海 的接口传参修改
---
src/views/other/payment/saleInvoice/addSaleInvoice.vue | 167 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 112 insertions(+), 55 deletions(-)
diff --git a/src/views/other/payment/saleInvoice/addSaleInvoice.vue b/src/views/other/payment/saleInvoice/addSaleInvoice.vue
index 70c635f..44889e2 100644
--- a/src/views/other/payment/saleInvoice/addSaleInvoice.vue
+++ b/src/views/other/payment/saleInvoice/addSaleInvoice.vue
@@ -13,7 +13,7 @@
:model="editConfig.infomation"
:rules="rules"
label-position="right"
- label-width="308px"
+ label-width="168px"
size="mini"
style="height: 60vh; overflow-x: hidden"
>
@@ -24,15 +24,46 @@
<div class="basic-info-view">
<el-row>
<el-col :span="12">
- <el-form-item label="涓婚" prop="subject">
- <el-input v-model="editConfig.infomation.subject"></el-input>
+ <el-form-item label="鍙戠エ缂栧彿" prop="number">
+ <el-input
+ v-if="
+ editConfig.title == '缂栬緫' ||
+ (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"
+ >璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span
+ >
+ <!-- <WordInput
+ v-if="codenumer && (explain != '' || isIdDisabled)&&method == 0"
+ :codenumer="codenumer"
+ :sum="sum"
+ :disabled="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="number">
- <el-input v-model="editConfig.infomation.number"></el-input>
+ <el-form-item label="涓婚" prop="subject">
+ <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">
@@ -45,6 +76,7 @@
"
value-key="name"
@select="handleSelectClient('client', $event)"
+ style="width: 100%"
></el-autocomplete>
<div class="common-select-btn" @click="selClientClick('client')">
<i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
@@ -67,6 +99,7 @@
placeholder="璇烽�夋嫨"
class="common-select-sel"
size="mini"
+ style="width: 100%"
>
<el-option v-for="item in invoiceTypeOptions" :key="item.id" :label="item.name" :value="item.id">
</el-option>
@@ -83,6 +116,7 @@
placeholder="璇烽�夋嫨"
class="common-select-sel"
size="mini"
+ style="width: 100%"
>
<el-option
v-for="item in invoiceStatusOptions"
@@ -102,7 +136,7 @@
v-model="editConfig.infomation.principalId"
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>
@@ -120,21 +154,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>
@@ -142,31 +180,35 @@
<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>
<el-col :span="12">
<el-form-item label="绾崇◣璇嗗埆鍙�" prop="taxpayerIdNumber">
- <el-input v-model="editConfig.infomation.taxpayerIdNumber"></el-input>
+ <el-input v-model="editConfig.infomation.taxpayerIdNumber" style="width: 100%"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -183,6 +225,7 @@
placeholder="璇烽�夋嫨"
class="common-select-sel"
size="mini"
+ style="width: 100%"
>
<el-option
v-for="item in courierCompanyOptions"
@@ -198,7 +241,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="鐗╂祦鍗曞彿" prop="courierNumber">
- <el-input v-model="editConfig.infomation.courierNumber"></el-input>
+ <el-input v-model="editConfig.infomation.courierNumber" style="width: 100%"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -208,13 +251,14 @@
value-format="yyyy-MM-dd"
type="date"
placeholder="閫夋嫨鏃ユ湡"
+ style="width: 100%"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鍙戠エ鍙风爜" prop="invoiceNumber">
- <el-input v-model="editConfig.infomation.invoiceNumber"></el-input>
+ <el-input v-model="editConfig.infomation.invoiceNumber" style="width: 100%"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -355,8 +399,10 @@
import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
import { addInvoice, getInvoiceTypeList, getInvoiceStatusList, getCourierCompanyList } from "@/api/common/payment"
+import codeMixin from "@/components/makepager/mixin/codeMixin"
export default {
name: "AddSaleInvoiceDialog",
+ mixins: [codeMixin],
props: {
editCommonConfig: {
type: Object,
@@ -384,9 +430,10 @@
},
data() {
return {
- dialogWidth: "80%",
+ dialogWidth: "50%",
editConfig: this.editCommonConfig,
rules: {
+ 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" }],
@@ -426,7 +473,7 @@
infomation: {}
},
clientId: this.editCommonConfig.infomation.client_id,
- SalesDetailsId: this.editCommonConfig.infomation.SalesDetailsId,
+ SalesDetailsId: this.editCommonConfig.infomation.id,
serviceContractId: this.editCommonConfig.infomation.id,
tableData: []
}
@@ -437,8 +484,24 @@
this.$store.dispatch("geSalesDetails")
this.setTableForm()
this.getCommonData()
+ this.formInfo();
+ },
+ 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;
+ }
+ this.getRCodeStandardList();
+ },
getCommonData() {
getAllData().then((res) => {
if (res.code === 200) {
@@ -448,33 +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)
},
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) {
@@ -534,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 || ""
}
@@ -592,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
}
},
@@ -605,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