From df7cd8c77806c252d865f50ad6a3ca8c725586f7 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期五, 13 十月 2023 11:25:44 +0800
Subject: [PATCH] bug修复（5156）
---
src/views/sales/masterOrder/AddMasterOrderDialog.vue | 72 ++++++++---------
src/views/service/clientServiceOrder/mixin/codeMixin.js | 2
src/views/client/followupRecords/mixin/codeMixin.js | 108 +++++++++++++-------------
3 files changed, 88 insertions(+), 94 deletions(-)
diff --git a/src/views/client/followupRecords/mixin/codeMixin.js b/src/views/client/followupRecords/mixin/codeMixin.js
index 8523a34..70bac5d 100644
--- a/src/views/client/followupRecords/mixin/codeMixin.js
+++ b/src/views/client/followupRecords/mixin/codeMixin.js
@@ -1,8 +1,8 @@
-import WordInput from "@/components/wordInput";
-import { getCodeStandardList } from "@/api/common/standard";
+import WordInput from "@/components/wordInput"
+import { getCodeStandardList } from "@/api/common/standard"
export default {
components: {
- WordInput,
+ WordInput
},
data() {
return {
@@ -14,90 +14,88 @@
codenumer: 0, //姣忔杈撳叆鐨勭紪鐮�
codenumberList: [], //鏁存潯缂栫爜
sum: 0,
- method:0,
- objCode: { name: "", page: 0, pageSize: 0, type: "璺熻繘璁板綍缂栫爜",codeStandID:'' },
- codeRule:{},
- };
+ method: 0,
+ objCode: { name: "", page: 0, pageSize: 0, type: "璺熻繘璁板綍缂栫爜", codeStandID: "" },
+ codeRule: {}
+ }
},
-
+
methods: {
async getRCodeStandardList() {
try {
- const res = await getCodeStandardList(this.objCode);
- this.codenumer = [];
- this.sum = 0;
- this.explain = "";
- if(res.data.code==200){
+ const res = await getCodeStandardList(this.objCode)
+ this.codenumer = []
+ this.sum = 0
+ this.explain = ""
+ if (res.data.code == 200) {
const {
List = [],
ID,
AutoRule = {},
- Method,
- } = (res.data.data&&res.data.data.data) ? res.data.data.data[0] : [];
- this.codeRule= (res.data.data&&res.data.data.data) ? res.data.data.data[0]:{}
- let autoRule=AutoRule
- let method=Method?Method:0
- this.method=method
- let rules=List
- this.editConfig.infomation.ID=ID
+ Method
+ } = res.data.data && res.data.data.data ? res.data.data.data[0] : []
+ this.codeRule = res.data.data && res.data.data.data ? res.data.data.data[0] : {}
+ let autoRule = AutoRule
+ let method = Method ? Method : 0
+ this.method = method
+ let rules = List
+ this.editConfig.infomation.ID = ID
if (method == 0 && res.data.data.data.length > 0) {
+ console.log("sss")
rules.forEach((item, index) => {
// setTimeout(() => {
// this.codenumer = item.length;
// this.sum++;
// }, 200);
- this.codenumer.push(item.Length);
- this.sum++;
- this.explain += item.Name + (index === rules.Length - 1 ? "" : "/");
- });
+ this.codenumer.push(item.Length)
+ this.sum++
+ this.explain += item.Name + (index === rules.Length - 1 ? "" : "/")
+ })
}
+ console.log(method)
if (method == 1) {
if (Object.keys(autoRule).length > 0) {
- this.isIdDisabled = true;
+ this.isIdDisabled = true
if (autoRule.PrefixMethod == 1) {
- let prefix = autoRule.PrefixValue.split("").length;
-
- this.codenumer.push(prefix);
+ let prefix = autoRule.PrefixValue.split("").length
+
+ this.codenumer.push(prefix)
if (autoRule.SuffixMethod == 2) {
- this.codenumer.push(8);
+ this.codenumer.push(8)
}
if (autoRule.AutoLength) {
- this.codenumer.push(autoRule.AutoLength);
+ this.codenumer.push(autoRule.AutoLength)
}
- this.sum = prefix + Number(autoRule.AutoLength);
+ this.sum = prefix + Number(autoRule.AutoLength)
this.codeList(
this.editConfig.infomation.number ? this.editConfig.infomation.number : autoRule.PrefixValue
- );
- return true;
+ )
+ return true
}
}
}
- if(this.editConfig.infomation.id){
- this.codeList( this.editConfig.infomation.number);
+ if (this.editConfig.title !== "鏂板缓") {
+ this.codeList(this.editConfig.infomation.number)
}
-
- this.$forceUpdate();
- }else{
- this.$message.error(res.data.msg?res.data.msg:'鑾峰彇缂栫爜瑙勮寖澶辫触锛岃閲嶈瘯锛�')
+
+ this.$forceUpdate()
+ } else {
+ this.$message.error(res.data.msg ? res.data.msg : "鑾峰彇缂栫爜瑙勮寖澶辫触锛岃閲嶈瘯锛�")
}
-
} catch (err) {
- console.log(err);
+ console.log(err)
}
},
codeList(val) {
- console.log(val,'===val codelist')
- this.inputValue = val;
- this.codenumberList = val.toString();
- this.editConfig.infomation.number =
- this.codenumberList.length > 0
- ? this.codenumberList.replace(/,/g, "")
- : "";
- console.log(this.codenumberList.replace(/,/g, ""));
+ console.log(val, "===val codelist")
+ this.inputValue = val
+ this.codenumberList = val.toString()
+ this.editConfig.infomation.number = this.codenumberList.length > 0 ? this.codenumberList.replace(/,/g, "") : ""
+ console.log(this.codenumberList.replace(/,/g, ""))
},
// 閰嶇疆缂栫爜瑙勮寖鐨勮烦杞�
- numberClick(){
- window.open('http://www.fai365.com:9080/facilty','_blank')
- },
- },
-};
+ numberClick() {
+ window.open("http://www.fai365.com:9080/facilty", "_blank")
+ }
+ }
+}
diff --git a/src/views/sales/masterOrder/AddMasterOrderDialog.vue b/src/views/sales/masterOrder/AddMasterOrderDialog.vue
index a4b6c1f..156330a 100644
--- a/src/views/sales/masterOrder/AddMasterOrderDialog.vue
+++ b/src/views/sales/masterOrder/AddMasterOrderDialog.vue
@@ -23,29 +23,25 @@
<div v-if="isUnflod" class="basic-info-title">鍩烘湰淇℃伅</div>
<div class="basic-info-view">
<el-row>
-<!-- <el-col v-if="isUnflod" :span="12">-->
-<!-- <el-form-item label="鍗曟嵁缂栧彿" prop="number">-->
-<!-- <el-input v-model="editConfig.infomation.number"></el-input>-->
-<!-- </el-form-item>-->
-<!-- </el-col>-->
+ <!-- <el-col v-if="isUnflod" :span="12">-->
+ <!-- <el-form-item label="鍗曟嵁缂栧彿" prop="number">-->
+ <!-- <el-input v-model="editConfig.infomation.number"></el-input>-->
+ <!-- </el-form-item>-->
+ <!-- </el-col>-->
<el-col v-if="isUnflod" :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">
@@ -178,11 +174,11 @@
import { getAllData } from "@/api/client/client"
import { getAddMasterOrder, getUpdateMasterOrder } from "@/api/sales/masterOrder"
import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
-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: "QuotationDialog",
- mixins:[codeMixin],
+ mixins: [codeMixin],
props: {
editCommonConfig: {
type: Object,
@@ -195,7 +191,7 @@
}
}
},
- components: {WordInput, SelectClientDialog },
+ components: { WordInput, SelectClientDialog },
computed: {
clientList() {
return this.$store.state.getClientName.clientList
@@ -220,7 +216,7 @@
infomation: {}
},
clientId: this.editCommonConfig.infomation.client_id,
- objCode: { name: "", page: 0, pageSize: 0, type: "閿�鍞�诲崟缂栫爜",codeStandID:'' },
+ objCode: { name: "", page: 0, pageSize: 0, type: "閿�鍞�诲崟缂栫爜", codeStandID: "" }
}
},
created() {
@@ -228,23 +224,23 @@
this.getCommonData()
this.formInfo()
},
- watch:{
- 'editCommonConfig.visible'(val){
- if(val){
+ watch: {
+ "editCommonConfig.visible"(val) {
+ if (val) {
this.formInfo()
}
},
- 'editCommonConfig.infomation.codeStandID'(val){
+ "editCommonConfig.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()
@@ -291,10 +287,10 @@
* 寮哄埗鍒锋柊form缁勪欢
* 澶栭儴鏇存敼琛ㄥ崟鍊间笉浼氳Е鍙戣〃鍗曟牎楠�,瀵艰嚧鍗充娇鏈夊�煎琚〃鍗曟牎楠岄樆濉炰綇
*/
- refresh(){
- this.refreshFlag=false
- requestAnimationFrame(()=>{
- this.refreshFlag=true
+ refresh() {
+ this.refreshFlag = false
+ requestAnimationFrame(() => {
+ this.refreshFlag = true
})
},
saveParams() {
@@ -307,8 +303,8 @@
money: data.money || 0,
number: data.number || "",
start_time: data.start_time || "",
- codeStandID:data.ID,
- codeRule:this.codeRule,
+ codeStandID: data.ID,
+ codeRule: this.codeRule
}
return params
},
@@ -399,7 +395,7 @@
font-size: 18px;
cursor: pointer;
}
- .el-autocomplete{
+ .el-autocomplete {
flex: 1;
}
}
diff --git a/src/views/service/clientServiceOrder/mixin/codeMixin.js b/src/views/service/clientServiceOrder/mixin/codeMixin.js
index 07a2455..b0f9b5e 100644
--- a/src/views/service/clientServiceOrder/mixin/codeMixin.js
+++ b/src/views/service/clientServiceOrder/mixin/codeMixin.js
@@ -74,7 +74,7 @@
}
}
}
- if (this.editConfig.infomation.id) {
+ if (this.editConfig.title !== "鏂板缓") {
this.codeList(this.editConfig.infomation.serviceNumber)
}
--
Gitblit v1.8.0