From cdae87d86d3516b6275fc9ae2c251f83635c954c Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期五, 13 十月 2023 14:18:12 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.5.5:29418/web/crm-web into dev
---
src/views/service/serviceContract/AddServiceContractDialog.vue | 3
src/views/client/contacts/AddContactsDialog.vue | 2
src/views/service/serviceFollowup/AddServiceFollowupDialog.vue | 3
src/views/client/followupRecords/AddFollowupRecordsDialog.vue | 6
src/views/client/salesLead/AddSalesLeadDialog.vue | 8
src/views/sales/salesDetails/AddSalesDetailsDialog.vue | 86 ++++----
src/views/sales/salesReturn/AddSalesReturnDialog.vue | 77 +++----
src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue | 3
src/views/sales/refundForm/AddRefundFormDialog.vue | 85 ++++----
src/views/client/client/AddClientManageDialog.vue | 2
src/views/client/contacts/index.vue | 4
src/views/client/salesLead/DetailSalesLead.vue | 32 +-
src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue | 99 ++++-----
src/views/client/salesLead/index.vue | 4
src/views/sales/quotation/AddQuotationDialog.vue | 70 +++---
src/views/client/followupRecords/index.vue | 5
src/views/sales/subOrder/AddSubOrderDialog.vue | 71 +++----
src/views/sales/contractManage/AddContractManageDialog.vue | 2
18 files changed, 270 insertions(+), 292 deletions(-)
diff --git a/src/views/client/client/AddClientManageDialog.vue b/src/views/client/client/AddClientManageDialog.vue
index 594b776..e4ee9b8 100644
--- a/src/views/client/client/AddClientManageDialog.vue
+++ b/src/views/client/client/AddClientManageDialog.vue
@@ -29,7 +29,7 @@
v-if="codenumer && (explain != '' || isIdDisabled)&&method == 0"
:codenumer="codenumer"
:sum="sum"
- :disabled="editConfig.infomation.id || isIdDisabled"
+ :disabled="this.editConfig.title !== '鏂板缓'|| isIdDisabled"
:inputValue="inputValue"
@codeList="codeList"
/>
diff --git a/src/views/client/contacts/AddContactsDialog.vue b/src/views/client/contacts/AddContactsDialog.vue
index 155b037..42ca99a 100644
--- a/src/views/client/contacts/AddContactsDialog.vue
+++ b/src/views/client/contacts/AddContactsDialog.vue
@@ -29,7 +29,7 @@
v-if="codenumer && (explain != '' || isIdDisabled) && method == 0"
:codenumer="codenumer"
:sum="sum"
- :disabled="editConfig.infomation.id || isIdDisabled"
+ :disabled="this.editConfig.title !== '鏂板缓' || isIdDisabled"
:inputValue="inputValue"
@codeList="codeList"
/>
diff --git a/src/views/client/contacts/index.vue b/src/views/client/contacts/index.vue
index b00fe4d..562033e 100644
--- a/src/views/client/contacts/index.vue
+++ b/src/views/client/contacts/index.vue
@@ -34,10 +34,10 @@
@selTableCol="selTableCol"
>
<template slot="tableButton">
- <el-table-column label="鎿嶄綔" width="130" fixed="right">
+ <el-table-column label="鎿嶄綔" width="120" fixed="right">
<template slot-scope="scope">
<el-button @click="handleClick(scope.row)" type="text" size="small">缂栬緫</el-button>
- <el-button @click="followupClick(scope.row)" type="text" size="small">璺熻繘</el-button>
+ <!-- <el-button @click="followupClick(scope.row)" type="text" size="small">璺熻繘</el-button> -->
<el-button @click="delClick(scope.row.id)" type="text" size="small">鍒犻櫎</el-button>
</template>
</el-table-column>
diff --git a/src/views/client/followupRecords/AddFollowupRecordsDialog.vue b/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
index 30e8d3a..3ee7e0d 100644
--- a/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
+++ b/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
@@ -28,7 +28,7 @@
v-if="codenumer && (explain != '' || isIdDisabled)&&method == 0"
:codenumer="codenumer"
:sum="sum"
- :disabled="editConfig.infomation.id || isIdDisabled"
+ :disabled="this.editConfig.title !== '鏂板缓' || isIdDisabled"
:inputValue="inputValue"
@codeList="codeList"
/>
@@ -525,9 +525,9 @@
let follow_record = {
follow_record: {
client_id: this.clientId || 0,
- client_status_id: data.client_status_id || 0,
+ client_status_id: data.client_status_id || null,
contact_id: this.contactId || 0,
- contact_information_id: data.contact_information_id || 0,
+ contact_information_id: data.contact_information_id || null,
content: data.content || "",
follow_time: data.follow_time || "",
member_id: data.member_id || 0,
diff --git a/src/views/client/followupRecords/index.vue b/src/views/client/followupRecords/index.vue
index 592b2bb..0e14e4a 100644
--- a/src/views/client/followupRecords/index.vue
+++ b/src/views/client/followupRecords/index.vue
@@ -263,7 +263,10 @@
handleClick(row) {
console.log(row)
this.editConfig.title = "缂栬緫"
- this.editConfig.infomation = { ...row, sale_chance_name: "", sales_leads_name: "" }
+ let config=JSON.parse(JSON.stringify(row));
+ config.client_status_id=config.client_status_id?config.client_status_id:null
+ config.contact_information_id=config.contact_information_id?config.contact_information_id:null
+ this.editConfig.infomation = { ...config, sale_chance_name: "", sales_leads_name: "" }
this.editConfig.visible = true
},
// 鍒犻櫎
diff --git a/src/views/client/salesLead/AddSalesLeadDialog.vue b/src/views/client/salesLead/AddSalesLeadDialog.vue
index 9e18e09..e61ba56 100644
--- a/src/views/client/salesLead/AddSalesLeadDialog.vue
+++ b/src/views/client/salesLead/AddSalesLeadDialog.vue
@@ -26,7 +26,7 @@
v-if="codenumer && (explain != '' || isIdDisabled)&&method == 0"
:codenumer="codenumer"
:sum="sum"
- :disabled="editConfig.infomation.id || isIdDisabled"
+ :disabled="this.editConfig.title !== '鏂板缓' || isIdDisabled"
:inputValue="inputValue"
@codeList="codeList"
/>
@@ -41,7 +41,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="瀹㈡埛鍚嶇О" prop="name">
+ <el-form-item label="鎰忓悜瀹㈡埛鍚嶇О" prop="name">
<el-input v-model="editConfig.infomation.name" style="width: 100%"></el-input>
</el-form-item>
</el-col>
@@ -70,14 +70,14 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鍟嗘満鐘舵��" prop="businessStatus">
+ <el-form-item label="绾跨储鐘舵��" prop="businessStatus">
<span>{{ editConfig.infomation.businessStatus }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="鍟嗘満鏉ユ簮" prop="sales_sources_id">
+ <el-form-item label="绾跨储鏉ユ簮" prop="sales_sources_id">
<div class="common-select">
<el-select
v-model="editConfig.infomation.sales_sources_id"
diff --git a/src/views/client/salesLead/DetailSalesLead.vue b/src/views/client/salesLead/DetailSalesLead.vue
index 0fd12d9..ac32fcb 100644
--- a/src/views/client/salesLead/DetailSalesLead.vue
+++ b/src/views/client/salesLead/DetailSalesLead.vue
@@ -3,7 +3,7 @@
<el-drawer :visible.sync="detailConfig.visible" size="80%" :before-close="handleClose" :wrapperClosable="false">
<template slot="title">
<div class="header">
- <span class="header-label">瀹㈡埛鍚嶇О</span>
+ <span class="header-label">閿�鍞嚎绱�</span>
<span class="header-title">{{ detailConfig.infomation.name }}</span>
</div>
</template>
@@ -179,7 +179,7 @@
}
this.basicInfoList = [
{
- leftStr: "瀹㈡埛鍚嶇О",
+ leftStr: "鎰忓悜瀹㈡埛鍚嶇О",
leftValue: item.name,
rightStr: "閿�鍞嚎绱㈢紪鍙�",
rightValue: item.number
@@ -193,11 +193,11 @@
{
leftStr: "鎵嬫満鍙风爜",
leftValue: item.contact_phone,
- rightStr: "鍟嗘満鐘舵��",
+ rightStr: "绾跨储鐘舵��",
rightValue: "鏂板缓"
},
{
- leftStr: "鍟嗘満鏉ユ簮",
+ leftStr: "绾跨储鏉ユ簮",
leftValue: item.sales_resources,
rightStr: "璐熻矗浜�",
rightValue: item.member_name
@@ -205,21 +205,27 @@
{
leftStr: "鍒嗛厤鏃ユ湡",
leftValue: "",
- rightStr: "鍏捣鐘舵��",
+ // rightStr: "鍏捣鐘舵��",
+ // rightValue: ""
+ rightStr: "鍒涘缓鏃堕棿",
rightValue: ""
},
{
- leftStr: "鍒涘缓鏃堕棿",
- leftValue: "",
- rightStr: "鍒涘缓浜�",
- rightValue: ""
- },
- {
- leftStr: "鍏抽棴鍘熷洜",
+ // leftStr: "鍒涘缓鏃堕棿",
+ // leftValue: "",
+ // rightStr: "鍒涘缓浜�",
+ // rightValue: ""
+ leftStr: "鍒涘缓浜�",
leftValue: "",
rightStr: "",
rightValue: ""
- }
+ },
+ // {
+ // leftStr: "鍏抽棴鍘熷洜",
+ // leftValue: "",
+ // rightStr: "",
+ // rightValue: ""
+ // }
]
this.dynamicInfoList = [
{
diff --git a/src/views/client/salesLead/index.vue b/src/views/client/salesLead/index.vue
index 3d952f0..4bc7b1f 100644
--- a/src/views/client/salesLead/index.vue
+++ b/src/views/client/salesLead/index.vue
@@ -31,10 +31,10 @@
@selTableCol="selTableCol"
>
<template slot="tableButton">
- <el-table-column label="鎿嶄綔" width="160">
+ <el-table-column label="鎿嶄綔" width="150">
<template slot-scope="scope">
<el-button @click="handleClick(scope.row)" type="text" size="small">缂栬緫</el-button>
- <el-button @click="followupClick(scope.row)" type="text" size="small">璺熻繘</el-button>
+ <!-- <el-button @click="followupClick(scope.row)" type="text" size="small">璺熻繘</el-button> -->
<el-button @click="advanceClick(scope.row)" type="text" size="small">鎺ㄨ繘</el-button>
<el-button @click="delClick(scope.row.id)" type="text" size="small">鍒犻櫎</el-button>
</template>
diff --git a/src/views/sales/contractManage/AddContractManageDialog.vue b/src/views/sales/contractManage/AddContractManageDialog.vue
index 8c670d2..99bb138 100644
--- a/src/views/sales/contractManage/AddContractManageDialog.vue
+++ b/src/views/sales/contractManage/AddContractManageDialog.vue
@@ -27,7 +27,7 @@
v-if="codenumer && (explain != '' || isIdDisabled) && method == 0"
:codenumer="codenumer"
:sum="sum"
- :disabled="editConfig.infomation.id || isIdDisabled"
+ :disabled="editConfig.title !== '鏂板缓' || isIdDisabled"
:inputValue="inputValue"
@codeList="codeList"
/>
diff --git a/src/views/sales/quotation/AddQuotationDialog.vue b/src/views/sales/quotation/AddQuotationDialog.vue
index 66eebb6..d186f73 100644
--- a/src/views/sales/quotation/AddQuotationDialog.vue
+++ b/src/views/sales/quotation/AddQuotationDialog.vue
@@ -27,21 +27,17 @@
<el-col :span="12">
<el-form-item label="鎶ヤ环缂栧彿" prop="number">
<WordInput
- v-if="codenumer && (explain != '' || isIdDisabled)&&method == 0"
- :codenumer="codenumer"
- :sum="sum"
- :disabled="editConfig.infomation.id || isIdDisabled"
- :inputValue="inputValue"
- @codeList="codeList"
+ 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
+ >璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span
>
- <span v-else>{{editConfig.title==='鏂板缓'? '鑷姩鐢熸垚': editConfig.infomation.number}}</span>
+ <span v-else>{{ editConfig.title === "鏂板缓" ? "鑷姩鐢熸垚" : editConfig.infomation.number }}</span>
</el-form-item>
</el-col>
@@ -71,11 +67,11 @@
</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="number">-->
+ <!-- <el-input v-model="editConfig.infomation.number"></el-input>-->
+ <!-- </el-form-item>-->
+ <!-- </el-col>-->
<el-col :span="12">
<el-form-item label="鎶ヤ环鍗曠姸鎬�" prop="quotation_status_id">
<div class="common-select">
@@ -316,10 +312,10 @@
import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
import SelectContactDialog from "@/views/other/commonDialog/SelectContactDialog"
import SelectChanceDialog from "@/views/other/commonDialog/SelectChanceDialog"
-import codeMixin from "@/views/client/followupRecords/mixin/codeMixin";
+import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
export default {
name: "QuotationDialog",
- mixins:[codeMixin],
+ mixins: [codeMixin],
props: {
editCommonConfig: {
type: Object,
@@ -391,7 +387,7 @@
tableData: [],
productId: 1,
isNoProduct: true,
- objCode: { name: "", page: 0, pageSize: 0, type: "鎶ヤ环缂栫爜",codeStandID:'' },
+ objCode: { name: "", page: 0, pageSize: 0, type: "鎶ヤ环缂栫爜", codeStandID: "" }
}
},
created() {
@@ -402,23 +398,23 @@
this.getCommonData()
this.formInfo()
},
- watch:{
- 'editConfig.visible'(val){
- if(val){
+ watch: {
+ "editConfig.visible"(val) {
+ if (val) {
this.formInfo()
}
},
- 'editConfig.infomation.codeStandID'(){
+ "editConfig.infomation.codeStandID"() {
this.formInfo()
}
},
methods: {
- formInfo(){
- this.objCode.codeStandID = ''
- if(this.editConfig.infomation.codeStandID){
- this.objCode.codeStandID = this.editConfig.infomation.codeStandID;
+ formInfo() {
+ this.objCode.codeStandID = ""
+ if (this.editConfig.infomation.codeStandID) {
+ this.objCode.codeStandID = this.editConfig.infomation.codeStandID
}
- this.getRCodeStandardList();
+ this.getRCodeStandardList()
},
getCommonData() {
getAllData()
@@ -484,10 +480,10 @@
* 寮哄埗鍒锋柊form缁勪欢
* 澶栭儴鏇存敼琛ㄥ崟鍊间笉浼氳Е鍙戣〃鍗曟牎楠�,瀵艰嚧鍗充娇鏈夊�煎琚〃鍗曟牎楠岄樆濉炰綇
*/
- refresh(){
- this.refreshFlag=false
- requestAnimationFrame(()=>{
- this.refreshFlag=true
+ refresh() {
+ this.refreshFlag = false
+ requestAnimationFrame(() => {
+ this.refreshFlag = true
})
},
saveParams() {
@@ -504,8 +500,8 @@
sale_chance_id: this.saleChanceId || 0,
validity_date: data.validity_date || "",
products: this.tableData,
- codeStandID:data.ID,
- codeRule:this.codeRule,
+ codeStandID: data.ID,
+ codeRule: this.codeRule
}
return params
},
@@ -693,8 +689,8 @@
cursor: pointer;
}
}
- .custom-name{
- .el-autocomplete{
+ .custom-name {
+ .el-autocomplete {
flex: 1;
}
}
diff --git a/src/views/sales/refundForm/AddRefundFormDialog.vue b/src/views/sales/refundForm/AddRefundFormDialog.vue
index 91c3ed7..4a7f564 100644
--- a/src/views/sales/refundForm/AddRefundFormDialog.vue
+++ b/src/views/sales/refundForm/AddRefundFormDialog.vue
@@ -24,10 +24,26 @@
<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">
<el-autocomplete
- style="width:100%"
+ style="width: 100%"
v-model="editConfig.infomation.client_name"
:fetch-suggestions="
(queryString, callback) => {
@@ -50,32 +66,12 @@
</div>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item label="閫�娆惧崟缂栧彿" prop="number">
- <WordInput
- v-if="codenumer && (explain != '' || isIdDisabled)&&method == 0"
- :codenumer="codenumer"
- :sum="sum"
- :disabled="editConfig.infomation.id || 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="sale_return_nunber">
<div class="custom-name">
<el-autocomplete
-
- style="width:100%"
+ style="width: 100%"
v-model="editConfig.infomation.sale_return_nunber"
:fetch-suggestions="
(queryString, callback) => {
@@ -103,7 +99,7 @@
<el-col :span="12">
<el-form-item label="閿�鍞礋璐ｄ汉" prop="memberId">
<el-select
- style="width:100%"
+ style="width: 100%"
v-model="editConfig.infomation.memberId"
placeholder="璇烽�夋嫨"
size="mini"
@@ -116,7 +112,7 @@
<el-col :span="12">
<el-form-item label="閫�娆炬棩鏈�" prop="refundDate">
<el-date-picker
- style="width:100%"
+ style="width: 100%"
v-model="editConfig.infomation.refundDate"
value-format="yyyy-MM-dd"
type="date"
@@ -129,7 +125,7 @@
<el-form-item label="浠樻鏂瑰紡" prop="paymentTypeId">
<div class="common-select">
<el-select
- style="width:100%"
+ style="width: 100%"
v-model="editConfig.infomation.paymentTypeId"
placeholder="璇烽�夋嫨"
class="common-select-sel"
@@ -151,7 +147,7 @@
<el-form-item label="璐︽埛" prop="bankAccountId">
<div class="common-select">
<el-select
- style="width:100%"
+ style="width: 100%"
v-model="editConfig.infomation.bankAccountId"
placeholder="璇烽�夋嫨"
class="common-select-sel"
@@ -168,7 +164,7 @@
<el-form-item label="鏄惁寮�绁�" prop="isInvoice">
<div class="common-select">
<el-select
- style="width:100%"
+ style="width: 100%"
v-model="editConfig.infomation.isInvoice"
placeholder="璇烽�夋嫨"
class="common-select-sel"
@@ -189,7 +185,7 @@
<el-col :span="24">
<el-form-item label="閫�娆惧師鍥�" prop="reason" label-width="15%">
<el-input
- style="width:100%"
+ style="width: 100%"
type="textarea"
:autosize="{ minRows: 2 }"
v-model="editConfig.infomation.reason"
@@ -317,10 +313,10 @@
import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
import { getPaymentTypeList } from "@/api/common/payment"
-import codeMixin from "@/views/client/followupRecords/mixin/codeMixin";
+import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
export default {
name: "AddRefundFormDialog",
- mixins:[codeMixin],
+ mixins: [codeMixin],
props: {
editCommonConfig: {
type: Object,
@@ -389,27 +385,27 @@
this.$store.dispatch("geReturnList")
this.setTableForm()
this.getCommonData()
- this.formInfo();
+ this.formInfo()
},
- watch:{
- 'editClientManageConfig.visible'(val){
- if(val){
+ watch: {
+ "editClientManageConfig.visible"(val) {
+ if (val) {
this.formInfo()
}
},
- 'editClientManageConfig.infomation.codeStandID'(){
+ "editClientManageConfig.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) => {
this.memberOptions = res.data.member
@@ -485,8 +481,7 @@
sourceId: this.sourceId || 0,
sourceType: 1
},
- codeRule:this.codeRule,
-
+ codeRule: this.codeRule
}
return params
},
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index 62c1572..8b429f9 100644
--- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
+++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -24,10 +24,26 @@
<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">
<el-autocomplete
- style="width:100%;"
+ style="width: 100%"
v-model="editConfig.infomation.client_name"
:fetch-suggestions="
(queryString, callback) => {
@@ -50,31 +66,12 @@
</div>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item label="璁㈠崟缂栧彿" prop="number">
- <WordInput
- v-if="codenumer && (explain != '' || isIdDisabled)&&method == 0"
- :codenumer="codenumer"
- :sum="sum"
- :disabled="editConfig.infomation.id || 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="saleChanceId">
<div class="custom-name">
<el-autocomplete
- style="width:100%"
+ style="width: 100%"
v-model="editConfig.infomation.sale_chance_name"
:fetch-suggestions="
(queryString, callback) => {
@@ -117,7 +114,7 @@
value-format="yyyy-MM-dd"
type="date"
placeholder="閫夋嫨鏃ユ湡"
- style="width:100%"
+ style="width: 100%"
>
</el-date-picker>
</el-form-item>
@@ -125,7 +122,6 @@
<el-col :span="12">
<el-form-item label="閿�鍞礋璐ｄ汉" prop="memberId">
<el-select
-
v-model="editConfig.infomation.memberId"
placeholder="璇烽�夋嫨"
size="mini"
@@ -143,7 +139,7 @@
value-format="yyyy-MM-dd"
type="date"
placeholder="閫夋嫨鏃ユ湡"
- style="width:100%"
+ style="width: 100%"
>
</el-date-picker>
</el-form-item>
@@ -190,7 +186,7 @@
<el-col :span="12">
<el-form-item label="鏀惰揣鍦板潃" prop="address">
<el-input
- style="width:100%"
+ style="width: 100%"
type="textarea"
:autosize="{ minRows: 2 }"
v-model="editConfig.infomation.address"
@@ -228,7 +224,7 @@
<el-col :span="24">
<el-form-item label="鏉℃涓庢潯浠�" prop="conditions" label-width="15%">
<el-input
- style="width:100%;"
+ style="width: 100%"
type="textarea"
:autosize="{ minRows: 4 }"
v-model="editConfig.infomation.conditions"
@@ -378,10 +374,10 @@
import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
import SelectChanceDialog from "@/views/other/commonDialog/SelectChanceDialog"
import AddCollectionPlan from "@/views/other/payment/collectionPlan/AddCollectionPlan"
-import codeMixin from "@/views/client/followupRecords/mixin/codeMixin";
+import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
export default {
name: "AddSalesDetailsDialog",
- mixins:[codeMixin],
+ mixins: [codeMixin],
props: {
editCommonConfig: {
type: Object,
@@ -453,27 +449,27 @@
this.$store.dispatch("geChance")
this.setTableForm()
this.getCommonData()
- this.formInfo();
+ this.formInfo()
},
- watch:{
- 'editClientManageConfig.visible'(val){
- if(val){
+ watch: {
+ "editClientManageConfig.visible"(val) {
+ if (val) {
this.formInfo()
}
},
- 'editClientManageConfig.infomation.codeStandID'(){
+ "editClientManageConfig.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) => {
@@ -561,7 +557,7 @@
logisticCompany: data.logisticCompany || "",
logisticCost: data.logisticCost || 0,
logisticNumber: data.logisticNumber || "",
- codeRule:this.codeRule,
+ codeRule: this.codeRule
}
let params = {}
if (this.editConfig.title === "鏂板缓") {
@@ -662,7 +658,7 @@
{ label: "浜у搧鍚嶇О", prop: "name", productName: true, isRequird: true },
{ label: "浜у搧缂栧彿", prop: "number" },
{ label: "鏁伴噺", prop: "amount", inputNumber: true, isRequird: true },
- { label: "閿�鍞崟浠�", prop: "price",inputFloat: true },
+ { label: "閿�鍞崟浠�", prop: "price", inputFloat: true },
{ label: "浠风◣鍚堣", prop: "total", inputFloat: true }
]
}
@@ -722,8 +718,8 @@
<style lang="scss" scoped>
::v-deep {
.iframe-dialog .el-dialog__body {
- .el-form{
- .el-form-item{
+ .el-form {
+ .el-form-item {
width: 100%;
}
}
diff --git a/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue b/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
index ccd73d5..45378e9 100644
--- a/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
+++ b/src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
@@ -8,7 +8,8 @@
append-to-body
custom-class="iframe-dialog"
>
- <el-form v-if="refreshFlag"
+ <el-form
+ v-if="refreshFlag"
ref="form"
:model="editConfig.infomation"
:rules="rules"
@@ -23,31 +24,27 @@
<div class="basic-info-title">鏈轰細鍩烘湰淇℃伅</div>
<div class="basic-info-view">
<el-row>
-<!-- <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="number">
- <WordInput
- v-if="codenumer && (explain != '' || isIdDisabled)&&method == 0"
- :codenumer="codenumer"
- :sum="sum"
- :disabled="editConfig.infomation.id || 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="number">-->
+ <!-- <el-input v-model="editConfig.infomation.number"></el-input>-->
+ <!-- </el-form-item>-->
+ <!-- </el-col>-->
+ <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" ref="clientName">
<div class="custom-name">
@@ -572,11 +569,11 @@
import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
import SelectContactDialog from "@/views/other/commonDialog/SelectContactDialog"
import { getCityList } from "@/api/common/address"
-import WordInput from "@/components/wordInput.vue";
-import codeMixin from "@/views/client/followupRecords/mixin/codeMixin";
+import WordInput from "@/components/wordInput.vue"
+import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
export default {
name: "AddSalesOpportunityDialog",
- mixins:[codeMixin],
+ mixins: [codeMixin],
props: {
editCommonConfig: {
type: Object,
@@ -589,7 +586,7 @@
}
}
},
- components: {WordInput, SelectClientDialog, SelectContactDialog },
+ components: { WordInput, SelectClientDialog, SelectContactDialog },
computed: {
searchCommonHeight() {
return this.$refs.searchCommonView.offsetHeight
@@ -603,7 +600,7 @@
},
data() {
return {
- refreshFlag:true,
+ refreshFlag: true,
dialogWidth: "50%",
editConfig: this.editCommonConfig,
rules: {
@@ -615,7 +612,7 @@
currency: [{ required: true, message: "璇烽�夋嫨甯佺", trigger: "change" }],
expected_time: [{ required: true, message: "璇烽�夋嫨棰勮鎴愪氦鏃ユ湡", trigger: "change" }],
projected_amount: [{ required: true, message: "璇疯緭鍏ラ璁″悎鍚岄噾棰�", trigger: "blur" }],
- client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛", trigger: "change" }],
+ client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛", trigger: "change" }]
},
businessSourceOptions: [],
memberOptions: [],
@@ -642,7 +639,7 @@
restaurants: [],
clientId: this.editCommonConfig.infomation.client_id,
contactId: this.editCommonConfig.infomation.contact_id,
- objCode: { name: "", page: 0, pageSize: 0, type: "閿�鍞満浼氱紪鐮�",codeStandID:'' },
+ objCode: { name: "", page: 0, pageSize: 0, type: "閿�鍞満浼氱紪鐮�", codeStandID: "" }
}
},
created() {
@@ -652,25 +649,25 @@
this.getCityList(this.editConfig.infomation.province_id, "edit")
}
this.getCommonData()
- this.formInfo();
+ this.formInfo()
},
- watch:{
- 'editConfig.visible'(val){
- if(val){
+ watch: {
+ "editConfig.visible"(val) {
+ if (val) {
this.formInfo()
}
},
- 'editConfig.infomation.codeStandID'(){
+ "editConfig.infomation.codeStandID"() {
this.formInfo()
}
},
methods: {
- formInfo(){
- this.objCode.codeStandID = ''
- if(this.editConfig.infomation.codeStandID){
- this.objCode.codeStandID = this.editConfig.infomation.codeStandID;
+ formInfo() {
+ this.objCode.codeStandID = ""
+ if (this.editConfig.infomation.codeStandID) {
+ this.objCode.codeStandID = this.editConfig.infomation.codeStandID
}
- this.getRCodeStandardList();
+ this.getRCodeStandardList()
},
getCommonData() {
this.editConfig.infomation.country_id = 1
@@ -774,8 +771,8 @@
remark: data.remark || "",
detail_address: data.detail_address || "",
- codeStandID:data.ID,
- codeRule:this.codeRule,
+ codeStandID: data.ID,
+ codeRule: this.codeRule
}
return params
},
@@ -823,10 +820,10 @@
* 寮哄埗鍒锋柊form缁勪欢
* 澶栭儴鏇存敼琛ㄥ崟鍊间笉浼氳Е鍙戣〃鍗曟牎楠�,瀵艰嚧鍗充娇鏈夊�煎琚〃鍗曟牎楠岄樆濉炰綇
*/
- refresh(){
- this.refreshFlag=false
- requestAnimationFrame(()=>{
- this.refreshFlag=true
+ refresh() {
+ this.refreshFlag = false
+ requestAnimationFrame(() => {
+ this.refreshFlag = true
})
},
// 娓呴櫎宸查�夋嫨鐢ㄦ埛
@@ -894,8 +891,8 @@
flex: 1;
}
}
- .custom-name{
- .el-autocomplete{
+ .custom-name {
+ .el-autocomplete {
flex: 1;
}
}
diff --git a/src/views/sales/salesReturn/AddSalesReturnDialog.vue b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
index 566997b..0b271ca 100644
--- a/src/views/sales/salesReturn/AddSalesReturnDialog.vue
+++ b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
@@ -24,10 +24,26 @@
<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">
<el-autocomplete
- style="width:100%"
+ style="width: 100%"
v-model="editConfig.infomation.client_name"
:fetch-suggestions="
(queryString, callback) => {
@@ -50,31 +66,12 @@
</div>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item label="閿�鍞��璐у崟缂栧彿" prop="number">
- <WordInput
- v-if="codenumer && (explain != '' || isIdDisabled)&&method == 0"
- :codenumer="codenumer"
- :sum="sum"
- :disabled="editConfig.infomation.id || 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="鍚堝悓璁㈠崟">
<div class="custom-name">
<el-autocomplete
- style="width:100%"
+ style="width: 100%"
v-model="editConfig.infomation.salesDetailNumber"
:fetch-suggestions="
(queryString, callback) => {
@@ -125,7 +122,7 @@
value-format="yyyy-MM-dd"
type="date"
placeholder="閫夋嫨鏃ユ湡"
- style="width:100%"
+ style="width: 100%"
>
</el-date-picker>
</el-form-item>
@@ -140,7 +137,7 @@
<el-form-item label="鐘舵��" prop="salesReturnStatusId">
<div class="common-select">
<el-select
- style="width:100%"
+ style="width: 100%"
v-model="editConfig.infomation.salesReturnStatusId"
placeholder="璇烽�夋嫨"
class="common-select-sel"
@@ -162,7 +159,7 @@
<el-col :span="24">
<el-form-item label="閫�璐у師鍥�" prop="reason" label-width="15%">
<el-input
- style="width:100%"
+ style="width: 100%"
type="textarea"
:autosize="{ minRows: 2 }"
v-model="editConfig.infomation.reason"
@@ -249,10 +246,10 @@
import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
import { getProductList } from "@/api/common/other"
import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
-import codeMixin from "@/views/client/followupRecords/mixin/codeMixin";
+import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
export default {
name: "AddSalesReturnDialog",
- mixins:[codeMixin],
+ mixins: [codeMixin],
props: {
editCommonConfig: {
type: Object,
@@ -317,27 +314,27 @@
this.setTableForm()
this.getCommonData()
this.getProductList()
- this.formInfo();
+ this.formInfo()
},
- watch:{
- 'editClientManageConfig.visible'(val){
- if(val){
+ watch: {
+ "editClientManageConfig.visible"(val) {
+ if (val) {
this.formInfo()
}
},
- 'editClientManageConfig.infomation.codeStandID'(){
+ "editClientManageConfig.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) => {
@@ -420,7 +417,7 @@
sourceId: this.SalesDetailsId,
sourceType: 1
},
- codeRule:this.codeRule,
+ codeRule: this.codeRule
}
return params
},
diff --git a/src/views/sales/subOrder/AddSubOrderDialog.vue b/src/views/sales/subOrder/AddSubOrderDialog.vue
index 50f52d0..3acc1ed 100644
--- a/src/views/sales/subOrder/AddSubOrderDialog.vue
+++ b/src/views/sales/subOrder/AddSubOrderDialog.vue
@@ -9,7 +9,7 @@
custom-class="iframe-dialog"
>
<el-form
- v-if="refreshFlag"
+ v-if="refreshFlag"
ref="form"
:model="editConfig.infomation"
:rules="rules"
@@ -23,29 +23,20 @@
<div class="basic-info-title">鍩烘湰淇℃伅</div>
<div class="basic-info-view">
<el-row>
-<!-- <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="number">
<WordInput
- v-if="codenumer && (explain != '' || isIdDisabled)&&method == 0"
- :codenumer="codenumer"
- :sum="sum"
- :disabled="editConfig.infomation.id || isIdDisabled"
- :inputValue="inputValue"
- @codeList="codeList"
+ 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
+ >璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span
>
- <span v-else>{{editConfig.title==='鏂板缓'? '鑷姩鐢熸垚': editConfig.infomation.number}}</span>
+ <span v-else>{{ editConfig.title === "鏂板缓" ? "鑷姩鐢熸垚" : editConfig.infomation.number }}</span>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -196,13 +187,13 @@
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 WordInput from "@/components/wordInput.vue"
+import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
export default {
name: "SubOrderDialog",
- mixins:[codeMixin],
- components: {WordInput, CommonFormTableView, SelectClientDialog, SelectCommonDialog },
+ mixins: [codeMixin],
+ components: { WordInput, CommonFormTableView, SelectClientDialog, SelectCommonDialog },
props: {
editCommonConfig: {
type: Object,
@@ -267,7 +258,7 @@
tableData: [],
productId: 1,
addProductArr: [],
- objCode: { name: "", page: 0, pageSize: 0, type: "閿�鍞瓙鍗曠紪鐮�",codeStandID:'' },
+ objCode: { name: "", page: 0, pageSize: 0, type: "閿�鍞瓙鍗曠紪鐮�", codeStandID: "" }
}
},
created() {
@@ -275,25 +266,25 @@
this.$store.dispatch("geMaster")
this.setTableForm()
this.getCommonData()
- this.formInfo();
+ this.formInfo()
},
- watch:{
- 'editConfig.visible'(val){
- if(val){
+ watch: {
+ "editConfig.visible"(val) {
+ if (val) {
this.formInfo()
}
},
- 'editConfig.infomation.codeStandID'(){
+ "editConfig.infomation.codeStandID"() {
this.formInfo()
}
},
methods: {
- formInfo(){
- this.objCode.codeStandID = ''
- if(this.editConfig.infomation.codeStandID){
- this.objCode.codeStandID = this.editConfig.infomation.codeStandID;
+ formInfo() {
+ this.objCode.codeStandID = ""
+ if (this.editConfig.infomation.codeStandID) {
+ this.objCode.codeStandID = this.editConfig.infomation.codeStandID
}
- this.getRCodeStandardList();
+ this.getRCodeStandardList()
},
getCommonData() {
getAllData()
@@ -319,10 +310,10 @@
* 寮哄埗鍒锋柊form缁勪欢
* 澶栭儴鏇存敼琛ㄥ崟鍊间笉浼氳Е鍙戣〃鍗曟牎楠�,瀵艰嚧鍗充娇鏈夊�煎琚〃鍗曟牎楠岄樆濉炰綇
*/
- refresh(){
- this.refreshFlag=false
- requestAnimationFrame(()=>{
- this.refreshFlag=true
+ refresh() {
+ this.refreshFlag = false
+ requestAnimationFrame(() => {
+ this.refreshFlag = true
})
},
// 淇濆瓨
@@ -378,8 +369,8 @@
memberId: data.memberId || 0,
number: data.number || "",
product: this.tableData,
- codeStandID:data.ID,
- codeRule:this.codeRule,
+ codeStandID: data.ID,
+ codeRule: this.codeRule
}
return params
},
@@ -558,7 +549,7 @@
font-size: 18px;
cursor: pointer;
}
- .el-autocomplete{
+ .el-autocomplete {
flex: 1;
}
}
diff --git a/src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue b/src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue
index cde48e1..05298a4 100644
--- a/src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue
+++ b/src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue
@@ -25,12 +25,11 @@
<el-row>
<el-col :span="12">
<el-form-item label="鏈嶅姟鍗曠紪鍙�" prop="serviceNumber">
- <!-- <el-input v-model="editConfig.infomation.serviceNumber" style="width: 100%"></el-input> -->
<WordInput
v-if="codenumer && (explain != '' || isIdDisabled) && method == 0"
:codenumer="codenumer"
:sum="sum"
- :disabled="editConfig.infomation.id || isIdDisabled"
+ :disabled="editConfig.title !== '鏂板缓' || isIdDisabled"
:inputValue="inputValue"
@codeList="codeList"
/>
diff --git a/src/views/service/serviceContract/AddServiceContractDialog.vue b/src/views/service/serviceContract/AddServiceContractDialog.vue
index 43d019c..b8a514b 100644
--- a/src/views/service/serviceContract/AddServiceContractDialog.vue
+++ b/src/views/service/serviceContract/AddServiceContractDialog.vue
@@ -25,12 +25,11 @@
<el-row>
<el-col :span="12">
<el-form-item label="鏈嶅姟鍚堝悓缂栧彿" prop="number">
- <!-- <el-input v-model="editConfig.infomation.number" style="width: 100%"></el-input> -->
<WordInput
v-if="codenumer && (explain != '' || isIdDisabled) && method == 0"
:codenumer="codenumer"
:sum="sum"
- :disabled="editConfig.infomation.id || isIdDisabled"
+ :disabled="editConfig.title !== '鏂板缓' || isIdDisabled"
:inputValue="inputValue"
@codeList="codeList"
/>
diff --git a/src/views/service/serviceFollowup/AddServiceFollowupDialog.vue b/src/views/service/serviceFollowup/AddServiceFollowupDialog.vue
index 590ab2d..229809f 100644
--- a/src/views/service/serviceFollowup/AddServiceFollowupDialog.vue
+++ b/src/views/service/serviceFollowup/AddServiceFollowupDialog.vue
@@ -25,12 +25,11 @@
<el-row>
<el-col :span="12">
<el-form-item label="鍥炶鍗曠紪鍙�" prop="number">
- <!-- <el-input v-model="editConfig.infomation.number" style="width: 100%"></el-input> -->
<WordInput
v-if="codenumer && (explain != '' || isIdDisabled) && method == 0"
:codenumer="codenumer"
:sum="sum"
- :disabled="editConfig.infomation.id || isIdDisabled"
+ :disabled="editConfig.title !== '鏂板缓' || isIdDisabled"
:inputValue="inputValue"
@codeList="codeList"
/>
--
Gitblit v1.8.0