外部客户增加查询条件，客户定制修改域名等

epmet-oper-web/src/views/modules/customer/customize/ConfigEdit.vue

@@ -14,7 +14,8 @@
         <el-form-item label="默认功能名称"
                       prop="customizedName">
           <div class="item_width_1">
-            <span>{{dataForm.customizedName}}</span></div>
+            <span>{{dataForm.customizedName}}</span>
+          </div>
         </el-form-item>
         <el-form-item label="功能名称"
                       prop="functionName">
@@ -30,6 +31,34 @@
           </el-tooltip>
         </el-form-item>
       </div>
+
+      <div v-if="userType==='oper'"
+           style="margin-top:20px">
+        <el-form-item label="外链地址"
+                      prop="targetLink">
+          <el-input class="item_width_1"
+                    v-model="dataForm.targetLink"
+                    placeholder="外链地址"></el-input>
+
+        </el-form-item>
+      </div>
+
+      <div v-if="userType==='oper'"
+           style="margin-top:20px">
+        <el-form-item prop="domainName"
+                      class="block"
+                      label="业务域名">
+
+          <div>
+
+            <el-input style="width:300px;display:block;margin-bottom:10px; float:left"
+                      placeholder='请输入业务域名'
+                      v-model="dataForm.domainName"> </el-input>
+
+          </div>
+
+        </el-form-item>
+      </div>
       <div style="margin-top:20px">
         <el-form-item prop="defaultLargeImg"
                       label="默认大图标">
@@ -120,7 +149,9 @@ export default {
         defaultLargeImg: '', // 默认大图标
         iconLargeImg: '', // 自定义大图标
         defaultSmallImg: '', // 默认小图标
-        iconSmallImg: ''// 自定义小图标
+        iconSmallImg: '',// 自定义小图标
+        domainName: '',//业务域名
+        targetLink: ''//外链地址
 
       },
       uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/function/upload'
@@ -130,6 +161,9 @@ export default {
     // this.queryFunctionList()
   },
   computed: {
+    userType () {
+      return localStorage.getItem('userType')
+    },
     dataRule () {
       return {
         functionName: [

epmet-oper-web/src/views/modules/partner/app/index.vue

@@ -2,8 +2,41 @@
   <div>
     <el-card shadow="never"
              class="aui-card--fill">
+
       <el-form :inline="true"
-               :model="tableParams">
+               :model="tableParams"
+               ref="tableParams"
+               :label-width="'120px'">
+
+        <el-form-item label="所属客户"
+                      prop="customerId">
+          <div>
+            <el-radio-group v-model="tableParams.customerType"
+                            @change="onSelectedCustomerTypeChange">
+              <el-radio label="external">外部客户</el-radio>
+              <el-radio label="internal">内部客户</el-radio>
+            </el-radio-group>
+          </div>
+
+        </el-form-item>
+        <el-form-item>
+          <el-select class="item_width_1"
+                     v-model="tableParams.customerId"
+                     placeholder="请选择"
+                     clearable>
+            <el-option v-for="item in customerList"
+                       :key="item.customerId"
+                       :label="item.customerName"
+                       :value="item.customerId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item>
+          <el-button type="primary"
+                     @click="refresh()">查询</el-button>
+        </el-form-item>
+
         <el-form-item>
           <el-button type="primary"
                      @click="addShow">新增</el-button>
@@ -29,7 +62,13 @@
   </div>
 </template>
 
-<style lang="scss" src="@/assets/scss/modules/wx-mini/index-set.scss"></style>
+<style lang="scss">
+@import "@/assets/scss/modules/wx-mini/index-set.scss";
+.item_width_1 {
+  width: 300px;
+  display: inline;
+}
+</style>
 
 <script>
 import { mapGetters } from "vuex";
@@ -52,7 +91,10 @@ export default {
     return {
       tableUrl: requestUrlPrefix + "/commonservice/externalapp/list",
       // 查询条件
-      tableParams: {},
+      tableParams: {
+        customerId: "",
+        customerType: "internal",
+      },
 
       operations: [
         {
@@ -104,6 +146,15 @@ export default {
         //   },
         // },
       ],
+
+      dataForm: {
+        appId: "",
+        appName: "",
+
+        customerName: "",
+
+      },
+      customerList: [],
     };
   },
 
@@ -116,9 +167,54 @@ export default {
 
   created () {
     this.refresh();
+    this.queryCustomerList();
   },
 
   methods: {
+
+    async queryCustomerList () {
+      if (this.tableParams.customerType === 'external') {
+        this.queryExternalCustomerList();
+      } else {
+        this.queryInternalCustomerList();
+      }
+    },
+    // 加载外部客户列表
+    async queryExternalCustomerList () {
+
+      const { data, code, msg, internalMsg } = await requestPost(
+        requestUrlPrefix + "/commonservice/externalcustomer/list",
+        {
+          pageNo: 1,
+          pageSize: 1000,
+        }
+      );
+
+      if (code === 0) {
+        this.customerList = data.list;
+      } else {
+        this.$message.error(msg + "：" + internalMsg)
+      }
+    },
+    // 加载内部客户列表
+    queryInternalCustomerList () {
+      window.app.ajax.get(
+        "/oper/crm/customer/getvalidcustomerlist",
+        {},
+        (data, rspMsg) => {
+          this.customerList = data;
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg)
+        }
+      )
+    },
+    // 客户类型单选框变化
+    onSelectedCustomerTypeChange (value) {
+      this.tableParams.customerType = value;
+      this.queryCustomerList();
+    },
+
     // 刷新
     async refresh () {
       await nextTick();

epmet-oper-web/src/views/modules/sys/user-add-or-update.vue

@@ -1,40 +1,74 @@
 <template>
-  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
-      <el-form-item prop="username" :label="$t('user.username')">
-        <el-input v-model="dataForm.realName" :placeholder="$t('user.username')"></el-input>
+  <el-dialog :visible.sync="visible"
+             :title="!dataForm.id ? $t('add') : $t('update')"
+             :close-on-click-modal="false"
+             :close-on-press-escape="false">
+    <el-form :model="dataForm"
+             :rules="dataRule"
+             ref="dataForm"
+             @keyup.enter.native="dataFormSubmitHandle()"
+             label-width="120px">
+      <el-form-item prop="username"
+                    :label="$t('user.username')">
+        <el-input v-model="dataForm.realName"
+                  :placeholder="$t('user.username')"></el-input>
       </el-form-item>
-<!--      <el-form-item prop="deptName" :label="$t('user.deptName')">-->
-<!--        <ren-dept-tree v-model="dataForm.deptId" :placeholder="$t('dept.title')" :dept-name.sync="dataForm.deptName"></ren-dept-tree>-->
-<!--      </el-form-item>-->
-      <el-form-item v-if="!dataForm.id" prop="password" :label="$t('user.password')" :class="{ 'is-required': !dataForm.id }">
-        <el-input v-model="dataForm.password" type="password" :placeholder="$t('user.password')"></el-input>
+      <!--      <el-form-item prop="deptName" :label="$t('user.deptName')">-->
+      <!--        <ren-dept-tree v-model="dataForm.deptId" :placeholder="$t('dept.title')" :dept-name.sync="dataForm.deptName"></ren-dept-tree>-->
+      <!--      </el-form-item>-->
+      <el-form-item v-if="!dataForm.id"
+                    prop="password"
+                    :label="$t('user.password')"
+                    :class="{ 'is-required': !dataForm.id }">
+        <el-input v-model="dataForm.password"
+                  type="password"
+                  :placeholder="$t('user.password')"></el-input>
       </el-form-item>
-      <el-form-item v-if="!dataForm.id" prop="confirmPassword" :label="$t('user.confirmPassword')" :class="{ 'is-required': !dataForm.id }">
-        <el-input v-model="dataForm.confirmPassword" type="password" :placeholder="$t('user.confirmPassword')"></el-input>
+      <el-form-item v-if="!dataForm.id"
+                    prop="confirmPassword"
+                    :label="$t('user.confirmPassword')"
+                    :class="{ 'is-required': !dataForm.id }">
+        <el-input v-model="dataForm.confirmPassword"
+                  type="password"
+                  :placeholder="$t('user.confirmPassword')"></el-input>
       </el-form-item>
-<!--      <el-form-item prop="realName" :label="$t('user.realName')">-->
-<!--        <el-input v-model="dataForm.realName" :placeholder="$t('user.realName')"></el-input>-->
-<!--      </el-form-item>-->
-      <el-form-item prop="gender" :label="$t('user.gender')" size="mini">
+      <!--      <el-form-item prop="realName" :label="$t('user.realName')">-->
+      <!--        <el-input v-model="dataForm.realName" :placeholder="$t('user.realName')"></el-input>-->
+      <!--      </el-form-item>-->
+      <el-form-item prop="gender"
+                    :label="$t('user.gender')"
+                    size="mini">
         <el-radio-group v-model="dataForm.gender">
           <el-radio :label="0">{{ $t('user.gender0') }}</el-radio>
           <el-radio :label="1">{{ $t('user.gender1') }}</el-radio>
           <el-radio :label="2">{{ $t('user.gender2') }}</el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item prop="email" :label="$t('user.email')">
-        <el-input v-model="dataForm.email" :placeholder="$t('user.email')"></el-input>
+      <el-form-item prop="email"
+                    :label="$t('user.email')">
+        <el-input v-model="dataForm.email"
+                  :placeholder="$t('user.email')"></el-input>
       </el-form-item>
-      <el-form-item prop="phone" :label="$t('user.mobile')">
-        <el-input v-model="dataForm.phone" :placeholder="$t('user.mobile')"></el-input>
+      <el-form-item prop="phone"
+                    :label="$t('user.mobile')">
+        <el-input v-model="dataForm.phone"
+                  :placeholder="$t('user.mobile')"></el-input>
       </el-form-item>
-      <el-form-item prop="roleIdList" :label="$t('user.roleIdList')" class="role-list">
-        <el-select v-model="dataForm.roleIdList" multiple :placeholder="$t('user.roleIdList')">
-          <el-option v-for="role in roleList" :key="role.id" :label="role.name" :value="role.id"></el-option>
+      <el-form-item prop="roleIdList"
+                    :label="$t('user.roleIdList')"
+                    class="role-list">
+        <el-select v-model="dataForm.roleIdList"
+                   multiple
+                   :placeholder="$t('user.roleIdList')">
+          <el-option v-for="role in roleList"
+                     :key="role.id"
+                     :label="role.name"
+                     :value="role.id"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item prop="status" :label="$t('user.status')" size="mini">
+      <el-form-item prop="status"
+                    :label="$t('user.status')"
+                    size="mini">
         <el-radio-group v-model="dataForm.status">
           <el-radio :label="0">{{ $t('user.status0') }}</el-radio>
           <el-radio :label="1">{{ $t('user.status1') }}</el-radio>
@@ -43,7 +77,12 @@
     </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+      <el-button type="primary"
+                 v-if="canSave"
+                 @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+      <el-button type="primary"
+                 v-else
+                 disabled>{{ $t('confirm') }}</el-button>
     </template>
   </el-dialog>
 </template>
@@ -55,6 +94,7 @@ export default {
   data () {
     return {
       visible: false,
+      canSave: true,
       roleList: [],
       roleIdListDefault: [],
       dataForm: {
@@ -143,7 +183,7 @@ export default {
           return this.$message.error(res.msg)
         }
         this.roleList = res.data
-      }).catch(() => {})
+      }).catch(() => { })
     },
     // 获取信息
     getInfo () {
@@ -164,14 +204,23 @@ export default {
           }
           this.roleIdListDefault.push(res.data.roleIdList[i])
         }
-      }).catch(() => {})
+      }).catch(() => { })
     },
     // 表单提交
-    dataFormSubmitHandle: debounce(function () {
+    dataFormSubmitHandle: debounce(function() {
+
       this.$refs['dataForm'].validate((valid) => {
         if (!valid) {
           return false
         }
+        if (!this.canSave) {
+          return;
+        }
+        this.canSave = false;
+        setTimeout(() => {
+          this.canSave = true   //点击一次时隔两秒后才能再次点击
+        }, 2000)
+
         this.$http[!this.dataForm.id ? 'post' : 'put']('/epmetuser/operuser', {
           ...this.dataForm,
           roleIdList: [
@@ -191,7 +240,7 @@ export default {
               this.$emit('refreshDataList')
             }
           })
-        }).catch(() => {})
+        }).catch(() => { })
       })
     }, 1000, { 'leading': true, 'trailing': false })
   }