From 604577d0481dfd1e915372e63dfea49154ff1298 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 19 九月 2024 14:58:22 +0800
Subject: [PATCH] 修改下单页面

---
 src/components/do/b1-ins-order/add.vue |   53 ++++++++++++++++++++++++++++-------------------------
 1 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 3780ba7..480367f 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -185,18 +185,13 @@
             <div class="search_label"><span class="required-span">* </span>鍒跺崟浜猴細</div>
             <div class="search_input">
               <el-input size="small" clearable disabled v-model="addObj.custom"></el-input>
-              <!-- <el-input readonly size="small" v-model="addObj.custom">
-                <template slot="append"><el-button slot="append" icon="el-icon-search" @click="selectUserDia = true"
-                    :disabled="active>1"></el-button></template>
-              </el-input> -->
             </div>
           </el-col>
           <el-col class="search_thing" :span="6">
             <div class="search_label"><span class="required-span">* </span>濮旀墭鍗曚綅锛�</div>
             <div class="search_input">
-              <!-- <el-input size="small" placeholder="鈫愰�夋嫨濮旀墭瀹㈡埛" clearable disabled v-model="addObj.company"></el-input> -->
               <el-input readonly size="small" v-model="addObj.company" placeholder="閫夋嫨濮旀墭鍗曚綅">
-                <template slot="append"><el-button slot="append" icon="el-icon-search" @click="selectUserDia = true"
+                <template slot="append"><el-button slot="append" icon="el-icon-search" @click="selectUserDia = true,createState=1"
                     :disabled="active>1"></el-button></template>
               </el-input>
             </div>
@@ -269,7 +264,7 @@
               </el-select>
             </div>
           </el-col>
-          <el-col class="search_thing" :span="6">
+          <!-- <el-col class="search_thing" :span="6">
             <div class="search_label">鎶ュ憡鍙戦�佹柟寮忥細</div>
             <div class="search_input">
               <el-radio-group v-model="addObj.send">
@@ -277,8 +272,8 @@
                 <el-radio :label="0">鍏朵粬</el-radio>
               </el-radio-group>
             </div>
-          </el-col>
-          <el-col class="search_thing" :span="6">
+          </el-col> -->
+          <!-- <el-col class="search_thing" :span="6">
             <div class="search_label">鏍峰搧澶勭悊鏂瑰紡锛�</div>
             <div class="search_input">
               <el-radio-group v-model="addObj.processing">
@@ -286,7 +281,7 @@
                 <el-radio :label="1">瀹為獙瀹ゅ鐞�</el-radio>
               </el-radio-group>
             </div>
-          </el-col>
+          </el-col> -->
           <el-col class="search_thing" :span="6">
             <div class="search_label">宸ョ▼鍚嶇О锛�</div>
             <div class="search_input">
@@ -304,8 +299,12 @@
           <el-col class="search_thing" :span="6">
             <div class="search_label"><span class="required-span">* </span>鐢熶骇鍗曚綅锛�</div>
             <div class="search_input">
-              <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.production"
-                :readonly="active>1"></el-input>
+              <!-- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.production"
+                :readonly="active>1"></el-input> -->
+              <el-input size="small" v-model="addObj.production" placeholder="閫夋嫨鐢熶骇鍗曚綅">
+                <template slot="append"><el-button slot="append" icon="el-icon-search" @click="selectUserDia = true,createState=2"
+                    :disabled="active>1"></el-button></template>
+              </el-input>
             </div>
           </el-col>
           <el-col class="search_thing" :span="6">
@@ -315,7 +314,7 @@
                 :readonly="active>1"></el-input>
             </div>
           </el-col>
-          <el-col class="search_thing" :span="6">
+          <!-- <el-col class="search_thing" :span="6">
             <div class="search_label">鏄惁鐣欐牱锛�</div>
             <div class="search_input">
               <el-radio-group v-model="addObj.isLeave">
@@ -323,7 +322,7 @@
                 <el-radio :label="1">鐣欐牱</el-radio>
               </el-radio-group>
             </div>
-          </el-col>
+          </el-col> -->
           <el-col class="search_thing" :span="6">
             <div class="search_label" style="width: 175px;">鏄惁娑夊強閰嶅鏍峰搧锛�</div>
             <div class="search_input" style="width: calc(100% - 175px);">
@@ -333,12 +332,12 @@
               </el-radio-group>
             </div>
           </el-col>
-          <el-col class="search_thing" :span="6">
+          <!-- <el-col class="search_thing" :span="6">
             <div class="search_label">OTC璁㈠崟鍙凤細</div>
             <div class="search_input">
               <el-input size="small" :placeholder="active>1 ? '' : '璇疯緭鍏�'" clearable v-model="addObj.otcCode" :readonly="active>1"></el-input>
             </div>
-          </el-col>
+          </el-col> -->
           <el-col class="search_thing" :span="6">
             <div class="search_label">濮旀墭浜猴細</div>
             <div class="search_input">
@@ -1146,6 +1145,7 @@
         selectiveEcho: [], // 妫�楠屼笅鍗曠殑鏃跺�欏嬀閫夋楠岄」鐩�,濡傛灉浣跨敤绛涢�夋彁浜ゆ樉绀烘楠岄」鐩负绌� 鍥炴樉鍒楄〃
         deaprtEnum:[],
         standard:[],
+        createState:1,//1:閫夋嫨濮旀墭鍗曚綅锛�2锛氶�夋嫨鐢熶骇鍗曚綅
       }
     },
     watch: {
@@ -1550,14 +1550,18 @@
           this.$message.error('鏈�夋嫨鏁版嵁')
           return
         }
-        this.addObj.company = selects.company
-        this.addObj.code = selects.code
-        this.addObj.companyId = selects.id
-        this.selectUserDia = false
-        if(this.active==1){
-          // TODO
-          this.selectInsOrderTemplate()
+        if(this.createState==1){
+          this.addObj.company = selects.company
+          this.addObj.code = selects.code
+          this.addObj.companyId = selects.id
+          if(this.active==1){
+            this.selectInsOrderTemplate()
+          }
+        }else if(this.createState==2){
+          this.addObj.production = selects.company
+          this.addObj.productionEn = selects.companyEn
         }
+        this.selectUserDia = false
       },
       containsValue(str) {
         if(str){
@@ -2613,12 +2617,11 @@
         })
       },
       methodChange(val, row) {
-        if (val === null || val === '') return
+        if (val === null || val === ''||val.length ==0) return
         this.currentMethod = row
         this.getProductLoad = true
         let selectTreeList = this.selectTree.split(" - ")
         this.addObj.model&&(selectTreeList[selectTreeList.length - 1] = this.addObj.model)
-
         this.$axios.post(this.$api.standardTree.selectStandardProductList, {
           model: (this.addObj.model?this.addObj.model:row.model) + '-' + row.modelNum,
           standardMethodListId: val.join(','),

--
Gitblit v1.9.3