cloud-web-corejs 1.0.54-dev.35 → 1.0.54-dev.351

package/src/views/user/user/dialog.vue

@@ -12,7 +12,7 @@
     v-el-drag-dialog
     v-el-dialog-center
   >
-    <div class="cont" style="height:450px">
+    <div class="cont" style="height:65vh">
       <vxe-grid
         class="is-pointer"
         ref="table-m1"
@@ -24,30 +24,35 @@
         @cell-dblclick="checkWithSubmit"
       >
         <template #form>
-          <div class="clearfix screen-btns">
-            <div class="fr">
+          <tableForm :formData.sync="formData" @searchEvent="searchEvent" @resetEvent="resetEvent">
+            <template #buttonRight>
               <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
                           plain>{{ $t1('重置') }}
               </vxe-button>
               <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">
                 {{ $t1('搜索') }}
               </vxe-button>
-            </div>
-          </div>
-          <vxe-form class="screen-box" title-width="92px" title-align="right" :data="formData" @submit="searchEvent"
-                    @reset="resetEvent">
-            <vxe-form-item :title="$t1('登录名')+':'" field="loginAccount">
-              <template v-slot>
-                <el-input v-model="formData.loginAccount" size="small" clearable/>
-              </template>
-            </vxe-form-item>
-            <vxe-form-item :title="$t1('姓名')+':'" field="nickName">
-              <template v-slot>
-                <el-input v-model="formData.nickName" size="small" clearable/>
-              </template>
-            </vxe-form-item>
-            <vxe-button type="submit" @click="searchEvent" v-show="false"></vxe-button>
-          </vxe-form>
+            </template>
+            <template #saleOrgName>
+              <vxe-form-item :title="$t1('机构')+':'">
+                <template v-slot>
+                  <el-input
+                    class="search-input"
+                    v-model="formData.saleOrgName"
+                    clearable
+                    @clear="
+                  formData.saleOrgId = null;
+                  formData.saleOrgName = null;
+                "
+                    v-el-readonly
+                  >
+                    <i slot="suffix" class="el-input__icon el-icon-search"
+                       @click="showSaleOrgDialog=true"></i>
+                  </el-input>
+                </template>
+              </vxe-form-item>
+            </template>
+          </tableForm>
         </template>
       </vxe-grid>
     </div>
@@ -62,7 +67,7 @@
         class="allDel icon-quanbushanchu" @click="clearChecked()"></a></el-tooltip>
       <div class="list">
         <div class="item" v-for="(checkRow, index) in checkRows" :key="index">
-          <p>{{ checkRow.nickName }}</p>
+          <p>{{ getCheckLabel(checkRow, 'nickName') }}</p>
           <a class="el-icon-close" @click="clearTable1Select(index)"></a>
         </div>
       </div>
@@ -78,14 +83,19 @@
 				{{ $t1('确 定') }}
 			</el-button>
 		</span>
+    <saleOrgDialog v-if="showSaleOrgDialog" :visiable.sync="showSaleOrgDialog" :multi="false"
+                   @confirm="confirmSaleOrgDialog"></saleOrgDialog>
   </el-dialog>
 </template>
 
 <script>
 import {selectDialogMixins} from '@base/mixins/selectDialog/index.js';
+import tableForm from "@base/components/table/tableForm.vue";
+import saleOrgDialog from "@base/views/user/sale_org/dialog.vue";
 
 export default {
   name: 'userDialog',
+  components: {tableForm, saleOrgDialog},
   props: ['visiable', 'multi', 'rows', 'param'],
   mixins: [selectDialogMixins],
   created() {
@@ -110,7 +120,8 @@ export default {
         saleOrgName: ''
       },
       selectMulti: true,
-      vxeOption: {}
+      vxeOption: {},
+      showSaleOrgDialog: false
     };
   },
   methods: {
@@ -129,6 +140,11 @@ export default {
             ...this.param
           }
         },
+        searchColumns: [
+          {title: this.$t1('登录名'), field: "loginAccount", type: "input", common: true},
+          {title: this.$t1('姓名'), field: "nickName", type: "input", common: true},
+          {title: this.$t1('机构'), field: "saleOrgName", type: "input", common: true, slot: "saleOrgName"},
+        ],
         config: {
           checkboxConfig: {
             checkStrictly: true,
@@ -147,9 +163,9 @@ export default {
             slots: {
               default: ({row}) => {
                 if (row.enabled) {
-                  return [<div class="txt-status">{ this.$t1('启用') }</div>];
+                  return [<div class="txt-status">{this.$t1('启用')}</div>];
                 } else {
-                  return [<div class="txt-status s-3">{ this.$t1('禁用') }</div>];
+                  return [<div class="txt-status s-3">{this.$t1('禁用')}</div>];
                 }
               }
             }
@@ -189,6 +205,13 @@ export default {
       this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
         that.vxeOption = opts;
       });
+    },
+    confirmSaleOrgDialog(rows) {
+      if (rows.length) {
+        let row = rows[0];
+        this.$set(this.formData, 'saleOrgId', row.id);
+        this.$set(this.formData, 'saleOrgName', row.name);
+      }
     }
   }
 };