md

src/views/emis/EmisBaseTools/CountryMutiSelectPicker.vue

@@ -67,6 +67,8 @@
       if(this.value){
         this.svalue=this.value.split(",");
         this.queryData(null,this.svalue.join(","));
+      }else{
+        this.svalue=[];
       }
     },
     mounted(){
@@ -83,20 +85,21 @@
         }
       },
       onBlur(val){
-        this.$emit("input", this.svalue.join(","));
+        if(this.svalue&&this.svalue.length>0){
+          this.$emit("input", this.svalue.join(","));
+        }else{
+          this.$emit("input", null);
+        }
         this.dispatch('ElFormItem', 'el.form.blur');
       },
       onChange() {
-          // this.$emit("input", this.svalue);
-          // let itemData = this.optionItems.find(item => item.code == this.svalue);
-          // this.$emit("change",itemData);
-          // this.$emit("onChange",itemData);
-          // this.dispatch('ElFormItem', 'el.form.change', [this.svalue]);
-
-          this.$emit("input", this.svalue.join(","));
-          let itemData = this.optionItems.find(item => item.code == this.svalue);
-          this.$emit("onChange",itemData);
-
+          if(this.svalue&&this.svalue.length>0){
+            this.$emit("input", this.svalue.join(","));
+            this.$emit("onChange",this.svalue);
+          }else{
+            this.$emit("input", null);
+            this.$emit("onChange",null);
+          }
       },
       remoteDebounce(val,key){
         debounce(this.queryData(val,key),1000);
@@ -113,7 +116,6 @@
           let allCuntruny={code:'-1',name:'全部',nameEn:'all'};
           this.optionItems =response.rows;
           this.optionItems.unshift(allCuntruny);
-
           // 初始值存储
           if(key==null && val==null){
             this.defaultItems=[...this.optionItems]

src/views/emis/emisCommissionQuote/emisCommissionQuoteForm.vue

@@ -105,7 +105,7 @@
                 </el-form-item>
             </el-col>
             <el-col :span="24">
-                <el-form-item label="快递类型" prop="transType">
+                <!-- <el-form-item label="快递类型" prop="transType">
                   <el-select v-model="form.transType" placeholder="快递类型" >
                     <el-option
                       v-for="dict in dict.type.emis_biz_shipping_method"
@@ -114,7 +114,17 @@
                       :value="dict.value"
                     ></el-option>
                   </el-select>
-                </el-form-item>
+                </el-form-item> -->
+            <el-form-item label="运输方式" prop="transTypeIdArr">
+              <el-select  multiple clearable  collapse-tags v-model="form.transTypeIdArr" placeholder="运输方式"  >
+                  <el-option
+                    v-for="item in dict.type.emis_biz_shipping_method"
+                    v-bind:key="item.value"
+                    v-bind:label="item.label"
+                    v-bind:value="item.value"
+                  />
+                </el-select>
+            </el-form-item>
             </el-col>
 
           <!-- <el-col :span="24">
@@ -282,6 +292,9 @@ export default {
           this.loading = true;
           getEmisCommissionQuote(this.quoteId).then(response => {
             this.form = response.data;
+            if(this.form.transType){
+              this.$set(this.form,"transTypeIdArr",this.form.transType.split(","))
+            }
             this.loading = false;
           });
         }else{
@@ -320,6 +333,7 @@ export default {
         calcType: null,
         postType: null,
         transType: null,
+        transTypeIdArr:null,
         blOpen: null,
         empCode: null,
         empName: null,
@@ -346,6 +360,10 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          if(this.form.transTypeIdArr){
+            this.form.transType=this.form.transTypeIdArr.join(",");
+          }
+
           if (this.form.quoteId != null) {
             updateEmisCommissionQuote(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");

src/views/emis/emisCommissionQuote/index.vue

@@ -214,7 +214,7 @@
           <dict-tag :options="dict.type.emis_commission_post" :value="scope.row.postType"/>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('快递类型')" align="center" prop="transType" min-width="100" >
+      <el-table-column :label="$t('快递类型')" align="center" prop="transType" min-width="100" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.emis_biz_shipping_method" :value="scope.row.transType"/>
         </template>