From 5e796658635bdfcb7806a49fd424ce08c7f8c4a3 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期五, 13 十月 2023 15:41:56 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/add-token

---
 src/views/sales/subOrder/AddSubOrderDialog.vue |   71 +++++++++++++++--------------------
 1 files changed, 31 insertions(+), 40 deletions(-)

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;
           }
         }

--
Gitblit v1.8.0