Merge branch 'master' of http://git.xdadan.com/tanex/emis-frontend

src/views/emis/EmisBaseTools/CountryPicker.vue

@@ -61,6 +61,7 @@
           }
         });
         this.$emit("change",itemData);
+        this.$emit("onChange",itemData);
         this.dispatch('ElFormItem', 'el.form.change', [this.svalue]);
         this.optionItems = this.bakOptionItems;
       },

src/views/emis/EmisBaseTools/EmisSiteSelectTreePicker.vue

@@ -225,12 +225,12 @@
         if (!value) return true;
         return ( data.siteCode.toLowerCase().indexOf(value.toLowerCase()) !== -1 || data.siteName.toLowerCase().indexOf(value.toLowerCase()) !== -1 ) ;
       },
+
       handleSelectSiteType(siteType){
         const item = this.dict.type.emis_site_type.find((item) => item.value === siteType);
         this.siteType=siteType;
         if(item!=null && item!=undefined){
           this.siteTypeName = item.label.length >2?item.label.substr(0,2):item.label;
-
         }else{
           this.siteTypeName='全部';
         }

src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue

@@ -47,10 +47,10 @@
         type: String,
         required: false
       },
-      // siteType:{
+      siteType:{
-      //   type: [String,Number],
+        type: [String,Number],
-      //   required: false
+        required: false
-      // },
+      },
       isInitiated:{
         type: [Boolean,String],
         required: false,
@@ -73,7 +73,7 @@
           pageNum:1,
           pageSize:20,
           searchValue:null,
-          // siteType:this.siteType,
+          siteType:this.siteType,
           countryCode:this.countryCode,
           siteCode:null
         }
@@ -89,10 +89,12 @@
       siteType(newVal, oldVal) {
         if(newVal!= oldVal ){
         }
+        this.initData();
       },
       countryCode(newVal, oldVal) {
         if(newVal!= oldVal ){
         }
+        this.initData();
       }
     },
     created() {

src/views/emis/emisQuotePrice/emisQuotePriceForm.vue

@@ -15,7 +15,7 @@
                 </el-col> -->
                 <el-col :span="24">
                   <el-form-item label="使用网点" prop="useSiteCode">
-                    <EmisSiteSimplePicker   v-model="form.useSiteCode" :placeholder="$t('使用网点')"  siteType="2" isInitiated="true" @onChange="onUseSiteChange"></EmisSiteSimplePicker>
+                    <EmisSiteSimplePicker   v-model="form.useSiteCode" :placeholder="$t('使用网点')"   isInitiated="true" @onChange="onUseSiteChange"></EmisSiteSimplePicker>
                     <!-- <div v-if="ownerSiteCode == 88888">
                       <EmisSiteSimplePicker   v-model="form.useSiteCode" :placeholder="$t('使用网点')"  siteType="2" isInitiated="true" :disabled="false" ></EmisSiteSimplePicker>
                     </div>
@@ -271,10 +271,10 @@ export default {
           { required: true, message: "报价名称不能为空", trigger: "blur" }
         ],
         useSiteCode: [
-          { required: true, message: "使用站点不能为空", trigger: "blur" }
+          { required: true, message: "使用站点不能为空", trigger: ["blur",'change'] }
         ],
         transLineCode: [
-          { required: true, message: "线路不能为空", trigger: "blur" }
+          { required: true, message: "线路不能为空", trigger: ["blur",'change'] }
         ],
         prodCode: [
           { required: true, message: "产品不能为空", trigger: "blur" }
@@ -362,6 +362,7 @@ export default {
 
             if(this.isCopy){
               this.form.quoteName=this.form.quoteName+"_Copy"
+              this.form.transLineCode=response.data.transLineCode;
             }
 
             this.loading = false;

src/views/emis/emisQuotePrice/index.vue

@@ -276,6 +276,7 @@ export default {
       // 总条数
       total: 0,
       currentId:null,
+      currentQuote:null,
       // 费用报价表格数据
       emisQuotePriceList: [],
       // 弹出层标题
@@ -384,12 +385,13 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.quoteId)
+      let [lastObj]=selection.slice(-1);
+      this.currentQuote=lastObj;
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
     handleSelectionSiteChange(selection) {
       this.ids = selection.map(item => item.baseSiteId)
-      console.log(this.ids);
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
@@ -414,11 +416,12 @@ export default {
       this.isCopy = false;
       this.titleForm = "修改干线运输费";
     },
-    handleCopy(row) {
+    handleCopy() {
-      this.currentId = row.quoteId || this.ids;
+      // console.log(this.currentQuote);
+      this.currentId = this.currentQuote.quoteId ;
       this.openForm = true;
       this.isCopy = true;
-      this.titleForm = "修改干线运输费";
+      this.titleForm = "复制干线运输费【"+this.currentQuote.quoteName+"】";
     },
     handleFormChanged(){
         this.openForm = false;

src/views/system/role/index.vue

@@ -185,13 +185,12 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="菜单权限">
-          <el-select v-model="domainId" placeholder="选择域" clearable filterable  @change="reGetMenuTreeselect">
+          <el-select v-model="domainId" placeholder="选择域" clearable filterable  @change="reInitMenuTreeselect">
             <el-option
               v-for="item in domainIdsOptions"
               v-bind:key="item.value"
               v-bind:label="item.label"
               v-bind:value="item.value"
-              @keyup.enter.native="handleQuery"
             />
           </el-select>
         </el-form-item>
@@ -269,7 +268,7 @@
 import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus } from "@/api/system/role";
 import { treeselect as menuTreeselect, roleMenuTreeselect,treeselectByDomainId } from "@/api/system/menu";
 import { treeselect as deptTreeselect, roleDeptTreeselect } from "@/api/system/dept";
-// import { listSysDomain } from "@/api/system/domain";
+import { listSysDomain } from "@/api/system/domain";
 
 export default {
   name: "Role",
@@ -361,24 +360,24 @@ export default {
     };
   },
   created() {
-    // this.initDomainList();
+    this.initDomainList();
     this.getList();
   },
   methods: {
-    // initDomainList() {
+    initDomainList() {
-    //   this.loading = true;
+      this.loading = true;
-    //   let qParams = {
+      let qParams = {
-    //     pageNum: 1,
+        pageNum: 1,
-    //     pageSize: 10000,
+        pageSize: 10000,
-    //   }
+      }
-    //   listSysDomain(qParams).then(response => {
+      listSysDomain(qParams).then(response => {
-    //       // this.domainIdsOptions.push({value:0,label:"全部"})
+          // this.domainIdsOptions.push({value:0,label:"全部"})
-    //       response.rows.forEach(item =>{
+          response.rows.forEach(item =>{
-    //           var optItem={value:item.id,label:item.name};
+              var optItem={value:item.id,label:item.name};
-    //           this.domainIdsOptions.push(optItem)
+              this.domainIdsOptions.push(optItem)
-    //       });
+          });
-    //   });
+      });
-    // },
+    },
     /** 查询角色列表 */
     getList() {
       this.loading = true;
@@ -399,7 +398,7 @@ export default {
       //   this.menuOptions = response.data;
       // });
     },
-    reGetMenuTreeselect() {
+    reInitMenuTreeselect() {
       var roleId = -1;
       if(this.form.roleId != undefined){
         roleId=this.form.roleId;