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/other/payment/saleInvoice/addSaleInvoice.vue | 117 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 87 insertions(+), 30 deletions(-)
diff --git a/src/views/other/payment/saleInvoice/addSaleInvoice.vue b/src/views/other/payment/saleInvoice/addSaleInvoice.vue
index 9d9c16a..2ab8b63 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,31 @@
<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">
+ <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 +61,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 +84,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 +101,7 @@
placeholder="璇烽�夋嫨"
class="common-select-sel"
size="mini"
+ style="width: 100%"
>
<el-option
v-for="item in invoiceStatusOptions"
@@ -102,7 +121,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>
@@ -121,6 +140,7 @@
"
value-key="number"
@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>
@@ -150,6 +170,7 @@
"
value-key="number"
@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>
@@ -166,7 +187,7 @@
</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 +204,7 @@
placeholder="璇烽�夋嫨"
class="common-select-sel"
size="mini"
+ style="width: 100%"
>
<el-option
v-for="item in courierCompanyOptions"
@@ -198,7 +220,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 +230,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 +378,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 "@/views/client/followupRecords/mixin/codeMixin";
export default {
name: "AddSaleInvoiceDialog",
+ mixins: [codeMixin],
props: {
editCommonConfig: {
type: Object,
@@ -384,7 +409,7 @@
},
data() {
return {
- dialogWidth: "80%",
+ dialogWidth: "50%",
editConfig: this.editCommonConfig,
rules: {
subject: [{ required: true, message: "璇疯緭鍏ヤ富棰�", trigger: "blur" }],
@@ -403,7 +428,7 @@
show: true,
total: true,
sumProp: ["Amount", "Unit", "total"],
- mergeNumber: 3
+ mergeNumber: 2
},
editSelectClientConfig: {
editVisible: false,
@@ -437,8 +462,27 @@
this.$store.dispatch("geSalesDetails")
this.setTableForm()
this.getCommonData()
+ this.formInfo();
+ },
+ 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;
+ }
+ this.getRCodeStandardList();
+ },
getCommonData() {
getAllData().then((res) => {
if (res.code === 200) {
@@ -479,28 +523,41 @@
// 淇濆瓨
saveClick(formName) {
this.$refs[formName].validate((valid) => {
+ this.validateFormNumber()
if (valid) {
console.log(this.editConfig.infomation)
- const params = this.saveParams()
- console.log(params)
- if (this.editConfig.title === "鏂板缓") {
- addInvoice(params).then((res) => {
- console.log(res)
- this.editConfig.visible = false
- if (res.code === 200) {
- this.$message.success("娣诲姞鎴愬姛")
- this.$parent.getData()
- }
- })
+ for (let i = 0; i < this.tableData.length; i++) {
+ if (this.tableData[i].name.length === 0) {
+ this.isNoProduct = true
+ break
+ } else {
+ this.isNoProduct = false
+ }
+ }
+ if (this.isNoProduct) {
+ this.$message.error("浜у搧鍚嶇О涓嶈兘涓虹┖")
} else {
- // getUpdateServiceContract(params).then((res) => {
- // console.log(res)
- // this.editConfig.visible = false
- // if (res.code === 200) {
- // this.$message.success("缂栬緫鎴愬姛")
- // this.$parent.getData()
- // }
- // })
+ const params = this.saveParams()
+ console.log(params)
+ if (this.editConfig.title === "鏂板缓") {
+ addInvoice(params).then((res) => {
+ console.log(res)
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ this.$message.success("娣诲姞鎴愬姛")
+ this.$parent.getData()
+ }
+ })
+ } else {
+ // getUpdateServiceContract(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")
--
Gitblit v1.8.0