lhd-dbug

bpo-admin/app/front/vues/pages/channelmerchantmanager/channelmerchantmanager.html

@@ -112,25 +112,19 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="商户名称：" prop="origin_merchant_id">
-            <el-select v-model="dkcompany.origin_merchant_id" placeholder="请选择商户名称" style="width:468px;" v-if="dkcompany.origin_id == 10000">
-              <el-option
-                v-for="item in optionsName"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id">
-              </el-option>
-            </el-select>
+          <el-form-item label="商户名称：" prop="origin_merchant_id" v-if="is_api == 1">
             <el-autocomplete
-              v-else
               class="inline-input"
               style="width:468px;"
-              v-model="dkcompany.merchant_name"
+              v-model="dkcompany.origin_merchant_id"
               :fetch-suggestions="querySearch"
               placeholder="请输入商户名称"
               @select="handleSelect"
             ></el-autocomplete>
           </el-form-item>
+          <el-form-item label="商户名称：" prop="merchant_name" v-if="is_api == 0">
+            <el-input v-model="dkcompany.merchant_name" placeholder="请输入商户名称" maxlength="200" style="width:468px;" clearable ></el-input>
+          </el-form-item>
           <el-form-item label="联系人：" prop="contact_man" >
             <el-input v-model="dkcompany.contact_man" placeholder="请输入联系人" maxlength="200" style="width:468px;" clearable ></el-input>
           </el-form-item>

bpo-admin/app/front/vues/pages/channelmerchantmanager/channelmerchantmanager.js

@@ -6,6 +6,7 @@
         };
 
         return {
+            is_api: 1,
             optionsName:[],
             optionsMerchants: [],
             optionsChannel:[],
@@ -73,11 +74,16 @@
             console.log('?????????????',queryString,cb);
             var self = this;
             this.$root.postReq("/web/channelCtl/originMerchants",  {
+                id: this.dkcompany.origin_id,
                 name: queryString
             })
             .then(function (d) {
                 if (d.status == 0) {
-                    cb(d.data)
+                    let arr = [];
+                    for(let i=0;i<d.data.length;i++){
+                        arr.push({'value':d.data[i].name},{'address': d.data[i].id} )
+                    }
+                    cb(arr)
                 } else {
                 }
             });
@@ -86,16 +92,13 @@
             console.log(item)
         },
         originMerchantsPost(value) {
-            var self = this;
-            this.$root.postReq("/web/channelCtl/originMerchants",  {
-                id: value
-            })
-            .then(function (d) {
-                if (d.status == 0) {
-                    self.optionsName = d.data || [];
-                } else {
+            console.log(value);
+            for (let i = 0; i < this.optionsMerchants.length; i++) {
+                if (value == this.optionsMerchants[i].id){
+                    this.is_api = this.optionsMerchants[i].is_api
                 } 
-            });
+            }
+            console.log(this.is_api);
         },
         channelDictsPost() {
             var self = this;