md

src/layout/components/Navbar.vue

@@ -171,8 +171,8 @@ export default {
     // 初始化客服
     initKFClient(){
       qimoClientId = {userId: this.empCode, nickName:this.empName,agent:'8001',customField: {}, priority: false}
-      console.log(qimoClientId);
+      // console.log(qimoClientId);
-      this.insertJsScript('https://ykf-weixin01.7moor.com/javascripts/7moorInit.js?accessId=0c6a3ec0-020b-11ef-a016-bf340ef083f1&autoShow=true&language=ZHCN');
+      // this.insertJsScript('https://ykf-weixin01.7moor.com/javascripts/7moorInit.js?accessId=0c6a3ec0-020b-11ef-a016-bf340ef083f1&autoShow=true&language=ZHCN');
     },
     toggleSideBar() {
       this.$store.dispatch('app/toggleSideBar')

src/views/emis/EmisBaseTools/TransProductPicker.vue

@@ -54,9 +54,9 @@
       }
     },
     created() {
-      if(this.isInitiated || this.svalue!=null){
+      // if(this.isInitiated || this.svalue!=null){
-         this.queryData();
+      // }
-      }
+      this.queryData();
     },
     methods: {
       onBlur(val){
@@ -75,7 +75,12 @@
         this.dispatch('ElFormItem', 'el.form.change', [this.svalue]);
       },
       queryData() {
-        let queryParams = {transLineCode:this.transLineCode,status:1};
+        let queryParams = {
+          pageNum: 1,
+          pageSize: 3000,
+          transLineCode:this.transLineCode,
+          status:1
+        };
         listSimpleEmisTransProduct(queryParams).then(response => {
             this.optionItems = response.rows;
         });

src/views/emis/emisTransProduct/emisTransProductForm.vue

@@ -112,10 +112,12 @@ export default {
       // 表单校验
       rules: {
         prodCode: [
-          { required: true, message: "产品代码不能为空", trigger: "blur" }
+          { required: true, message: "产品代码不能为空", trigger: "blur" },
+          { validator: this.validateCode, trigger: "blur" }
         ],
         prodName: [
-          { required: true, message: "名称不能为空", trigger: "blur" }
+          { required: true, message: "名称不能为空", trigger: "blur" },
+          { validator: this.validateName, trigger: "blur" }
         ],
         prodNameEn: [
           { required: true, message: "英文名称不能为空", trigger: "blur" }
@@ -175,6 +177,84 @@ export default {
           this.reset();
         }
     },
+    validateCode (rule, value, callback) {
+      if (!value) {
+        callback(new Error("请输入类型代码"));
+      } else if (value.length > 20) {
+        callback(new Error("长度为1-20"));
+      } else {
+        if (this.form.id) {
+          // 修改时检查账号是否重复
+          listEmisTransProduct({ prodCode: value})
+            .then((res) => {
+              if (res.rows.length==0) {
+                callback();
+              } else {
+                if(res.rows[0].id != this.form.id ){
+                  callback(new Error("类型代码重复"));
+                }else{
+                  callback();
+                }
+              }
+            })
+            .catch((error) => {
+              callback(new Error("验证失败，请重试"));
+            });
+        } else {
+          // 新增时检查账号是否重复
+          listEmisTransProduct({ prodCode: value})
+            .then((res) => {
+              if (res.rows.length==0) {
+                callback();
+              } else {
+                callback(new Error("类型代码重复"));
+              }
+            })
+            .catch((error) => {
+              callback(new Error("验证失败，请重试"));
+            });
+        }
+      }
+    },
+    validateName (rule, value, callback) {
+      if (!value) {
+        callback(new Error("请输入类型名称"));
+      } else if (value.length > 20) {
+        callback(new Error("长度为1-20"));
+      } else {
+        if (this.form.id) {
+          // 修改时检查账号是否重复
+          listEmisTransProduct({ prodName: value})
+            .then((res) => {
+              if (res.rows.length==0) {
+                callback();
+              } else {
+                if(res.rows[0].id != this.form.id ){
+                  callback(new Error("类型名称重复"));
+                }else{
+                  callback();
+                }
+              }
+            })
+            .catch((error) => {
+              callback(new Error("验证失败，请重试"));
+            });
+        } else {
+          // 新增时检查账号是否重复
+          listEmisTransProduct({ prodName: value})
+            .then((res) => {
+              if (res.rows.length==0) {
+                callback();
+              } else {
+                callback(new Error("类型名称重复"));
+              }
+            })
+            .catch((error) => {
+              callback(new Error("验证失败，请重试"));
+            });
+        }
+      }
+    },
     // 取消按钮
     cancel() {
       this.reset();
@@ -217,7 +297,7 @@ export default {
             });
           } else {
             addEmisTransProduct(this.form).then(response => {
-               this.$modal.msgSuccess("修改成功");
+               this.$modal.msgSuccess("新增成功");
                this.$emit("on-changed");
             });
           }

src/views/emis/emisTransProduct/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20" type='flex'>
+    <el-row :gutter="0" type='flex'>
-      <el-col :span="4" :xs="4" style="border-right:1px solid rgb(248 249 251);">
+      <!-- <el-col :span="4" :xs="4" style="border-right:1px solid rgb(248 249 251);">
         <CountryTreePicker placeholder="所属国家" v-model="queryParams.country" @onNodeClick="handleQuery"></CountryTreePicker>
-      </el-col>
+      </el-col> -->
-      <el-col :span="20" :xs="20">
+      <el-col :span="24" :xs="24">
         <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="10"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
           <el-form-item label="" prop="country">
             <CountryPicker :placeholder="$t('国家')" v-model="queryParams.country" @onChange="handleQuery"></CountryPicker>
@@ -350,7 +350,9 @@ export default {
     this.getList();
   },
   methods: {
+    handleSortChange(){
 
+    },
     handleStatusChange(row) {
         let text = row.status === "0" ? "启用" : "停用";
         this.$modal.confirm('确认要"' + text + '""' + row.prodName + '"产品类型吗？').then(function() {