cloud-web-corejs-haier 1.0.43 → 1.0.44

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

@@ -13,7 +13,7 @@
     v-el-drag-dialog
     v-el-dialog-center
   >
-    <div class="cont" style="height:65vh">
+    <div class="cont" style="height: 65vh">
       <vxe-grid
         class="is-pointer"
         ref="table-m1"
@@ -27,19 +27,37 @@
         <template #form>
           <div class="clearfix screen-btns">
             <div class="fr">
-              <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                          plain>{{ $t1('重置') }}
+              <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
+                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="companyName">
+          <vxe-form
+            class="screen-box"
+            title-width="92px"
+            title-align="right"
+            :data="formData"
+            @submit="searchEvent"
+            @reset="resetEvent"
+            v-if="!allCompany"
+          >
+            <vxe-form-item :title="$t1('组织名称') + ':'" field="companyName">
               <template v-slot>
-                <el-input v-model="formData.companyName" size="small" clearable/>
+                <el-input v-model="formData.companyName" size="small" clearable />
               </template>
             </vxe-form-item>
             <vxe-button type="submit" @click="searchEvent" v-show="false"></vxe-button>
@@ -54,8 +72,13 @@
       </div>
     </label>
     <div class="multipleChoice">
-      <el-tooltip :enterable="false" effect="dark" :content="$t1('全部删除')" placement="top"><a
-        class="allDel icon-quanbushanchu" @click="clearChecked()"></a></el-tooltip>
+      <el-tooltip
+        :enterable="false"
+        effect="dark"
+        :content="$t1('全部删除')"
+        placement="top"
+        ><a 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.companyName }}</p>
@@ -64,25 +87,27 @@
       </div>
     </div>
     <span slot="footer" class="dialog-footer">
-			<span class="fl tips" v-if="!selectMulti">{{ $t1('注：双击确认选择（单选）') }}</span>
-			<el-button type="primary" plain class="button-sty" @click="dialogCancel">
-				<i class="el-icon-close el-icon"></i>
-				{{ $t1('取 消') }}
-			</el-button>
-			<el-button type="primary" @click="dialogPrimary" class="button-sty">
-				<i class="el-icon-check el-icon"></i>
-				{{ $t1('确 定') }}
-			</el-button>
-		</span>
+      <span class="fl tips" v-if="!selectMulti">{{
+        $t1("注：双击确认选择（单选）")
+      }}</span>
+      <el-button type="primary" plain class="button-sty" @click="dialogCancel">
+        <i class="el-icon-close el-icon"></i>
+        {{ $t1("取 消") }}
+      </el-button>
+      <el-button type="primary" @click="dialogPrimary" class="button-sty">
+        <i class="el-icon-check el-icon"></i>
+        {{ $t1("确 定") }}
+      </el-button>
+    </span>
   </el-dialog>
 </template>
 
 <script>
-import {selectDialogMixins} from '@base/mixins/selectDialog/index.js';
+import { selectDialogMixins } from "@base/mixins/selectDialog/index.js";
 
 export default {
-  name: 'company_info_dialog',
-  props: ['title', 'visiable', 'multi', 'rows', 'param', 'firstEnabled', 'allCompany'],
+  name: "company_info_dialog",
+  props: ["title", "visiable", "multi", "rows", "param", "firstEnabled", "allCompany"],
   mixins: [selectDialogMixins],
   created() {
     if (this.$attrs.fieldKey) this.fieldKey = this.$attrs.fieldKey;
@@ -103,45 +128,51 @@ export default {
   methods: {
     initTableM1() {
       let that = this;
-      let path = USER_PREFIX + '/user_company_info/getCurrentList';
-      let treeNodeUrl = USER_PREFIX + '/user_company_info/getChildren';
+      let path = USER_PREFIX + "/user_company_info/getCurrentList";
+      let treeNodeUrl = USER_PREFIX + "/user_company_info/getChildren";
       if (this.allCompany) {
-        path = USER_PREFIX + '/company_info/getRoot';
-        treeNodeUrl = USER_PREFIX + '/company_info/getChildren';
+        path = USER_PREFIX + "/company_info/getRoot";
+        treeNodeUrl = USER_PREFIX + "/company_info/getChildren";
       }
       let tableOption = {
         vue: that,
-        tableRef: 'table-m1',
-        tableName: 'basic_ompany_info_dialog_list',
+        tableRef: "table-m1",
+        tableName: "basic_ompany_info_dialog_list",
         path: path,
         treeNodeUrl: treeNodeUrl,
         treeNodeParam: function (row) {
-          return {enabled: true, parentCompanyCode: row.companyCode};
+          return { enabled: true, parentCompanyCode: row.companyCode };
         },
         param: () => {
           return {
             enabled: true,
-            ...this.formData
-          }
+            ...this.formData,
+          };
         },
         columns: [
-          {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
-          {title: this.$t1('组织名称'), field: 'companyName', width: 250, fixed: 'left', treeNode: true},
-          {title: this.$t1('组织编码'), field: 'companyCode', width: 200},
+          { type: "checkbox", width: 48, resizable: false, fixed: "left" },
+          {
+            title: this.$t1("组织名称"),
+            field: "companyName",
+            width: 250,
+            fixed: "left",
+            treeNode: true,
+          },
+          { title: this.$t1("组织编码"), field: "companyCode", width: 200 },
           {
             width: 47,
-            fixed: 'right',
-            title: '',
-            sortable: false
-          }
+            fixed: "right",
+            title: "",
+            sortable: false,
+          },
         ],
         config: {
           checkboxConfig: {
             checkStrictly: true,
             showHeader: this.selectMulti,
-            trigger: 'row',
-            checkMethod: ({row}) => {
-              if (this.firstEnabled === 'true' || this.firstEnabled === true) {
+            trigger: "row",
+            checkMethod: ({ row }) => {
+              if (this.firstEnabled === "true" || this.firstEnabled === true) {
                 return true;
               } else {
                 if (!row.parentCompanyCode) {
@@ -150,15 +181,15 @@ export default {
                   return true;
                 }
               }
-            }
-          }
-        }
+            },
+          },
+        },
       };
 
-      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+      this.$vxeTableUtil.initVxeTable(tableOption).then((opts) => {
         that.vxeOption = opts;
       });
-    }
-  }
+    },
+  },
 };
 </script>

package/src/views/user/country/list.vue

@@ -1,197 +1,197 @@
-<template>
-  <div id="containt">
-    <el-tabs v-model="activeName" class="tab-box">
-      <el-tab-pane :label="$t1('常规')" name="first">
-        <editView v-if="showEdit" visible-key="showEdit" :_dataId.sync="dataId" :parent-target="_self"
-                  @reload="$reloadHandle"></editView>
-      </el-tab-pane>
-      <el-tab-pane :label="$t1('列表')" name="second">
-        <div class="grid-height">
-          <vxe-grid ref="table-m1" v-bind="vxeOption" @resizable-change="$vxeTableUtil.onColumnWitchChange"
-                    @custom="$vxeTableUtil.customHandle">
-            <template #form>
-              <div class="clearfix screen-btns">
-                <div class="fl">
-                  <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog">
-                    {{ $t1('新增') }}
-                  </vxe-button>
-                  <base-table-export :option="{ title: $t1('国家导出'), targetRef: 'table-m1'}" :parent-target="_self"/>
-                </div>
-                <div class="fr">
-                  <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 ref="form" class="screen-box" title-width="92px" title-align="right" :data="formData"
-                        @submit="searchEvent" @reset="searchEvent">
-                <vxe-form-item :title="$t1('国家名称')+':'" field="countryName">
-                  <template v-slot>
-                    <el-input v-model="formData.countryName" size="small" clearable/>
-                  </template>
-                </vxe-form-item>
-                <vxe-form-item :title="$t1('国家简称')+':'" field="simpleName">
-                  <template v-slot>
-                    <el-input v-model="formData.simpleName" size="small" clearable/>
-                  </template>
-                </vxe-form-item>
-                <vxe-form-item :title="$t1('国家编码')+':'" field="countryCode">
-                  <template v-slot>
-                    <el-input v-model="formData.countryCode" size="small" clearable/>
-                  </template>
-                </vxe-form-item>
-              </vxe-form>
-            </template>
-          </vxe-grid>
-        </div>
-      </el-tab-pane>
-    </el-tabs>
-  </div>
-</template>
-
-<script>
-import editView from './edit.vue';
-
-export default {
-  name: 'country:list',
-  components: {editView},
-  data() {
-    return {
-      activeName: 'second',
-      dataId: 0,
-      showEdit: false,
-      vxeOption: {},
-      formData: {}
-    };
-  },
-  mounted() {
-    this.initTableList();
-  },
-  methods: {
-    searchEvent() {
-      this.$refs['table-m1'].commitProxy('reload');
-    },
-    resetEvent() {
-      this.formData = {};
-      this.$refs['table-m1'].commitProxy('reload');
-    },
-    openEditDialog(id) {
-      this.dataId = !id || typeof id == 'object' ? 0 : id;
-      this.activeName = 'first';
-      this.$openEditView('showEdit');
-    },
-    initTableList() {
-      let that = this;
-      let tableOption = {
-        vue: this,
-        tableRef: 'table-m1',
-        tableName: 'user_country_list-m1',
-        path: USER_PREFIX + '/country/listPage',
-        param: () => {
-          return this.formData;
-        },
-        columns: [
-          {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
-          {
-            title: this.$t1('国家名称'),
-            field: 'countryName',
-            width: 250,
-            fixed: 'left'
-          },
-          {
-            field: 'simpleName',
-            title: this.$t1('国家简称'),
-            width: 150
-          },
-          {
-            field: 'countryCode',
-            title: this.$t1('国家编码'),
-            width: 150
-          },
-          {
-            field: 'enabled',
-            title: this.$t1('是否启用'),
-            width: 150,
-            slots: {
-              default: ({row}) => {
-                if (row.enabled) {
-                  return [
-                    <div class="txt-status">
-                      <span>{this.$t1('启用')}</span>
-                    </div>
-                  ];
-                } else {
-                  return [
-                    <div class="txt-status disable">
-                      <span>{this.$t1('禁用')}</span>
-                    </div>
-                  ];
-                }
-              }
-            }
-          },
-          {
-            field: 'createDate',
-            title: this.$t1('创建时间'),
-            width: 150
-          },
-          {
-            field: '_createBy',
-            title: this.$t1('创建人'),
-            width: 150
-          },
-          {
-            field: '_modifyBy',
-            title: this.$t1('更新人'),
-            width: 150
-          },
-          {
-            width: 47,
-            fixed: 'right',
-            title: '',
-            sortable: false,
-            slots: {
-              default: ({row}) => {
-                return [
-                  <div>
-                    <a
-                      href="javascript:void(0);"
-                      class="a-link"
-                      onclick={() => {
-                        this.openEditDialog(row.id);
-                      }}
-                    >
-                      <el-tooltip enterable={false} effect="dark" content={this.$t1('查看')} placement="top"
-                                  popper-class="tooltip-skin">
-                        <i class="el-icon-edit"/>
-                      </el-tooltip>
-                    </a>
-                  </div>
-                ];
-              }
-            }
-          }
-        ]
-      };
-      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
-        this.vxeOption = opts;
-      });
-    },
-    importExcel() {
-      let that = this;
-      that.$excelImport({
-        prefix: USER_PREFIX,
-        excel: USER_PREFIX + '/excelTemplate/country/country.xlsx',
-        multi: false,
-        saveUrl: USER_PREFIX + '/country/save',
-        callback: () => {
-          that.searchEvent();
-        }
-      });
-    }
-  }
-};
-</script>
+<template>
+  <div id="containt">
+    <el-tabs v-model="activeName" class="tab-box">
+      <el-tab-pane :label="$t1('常规')" name="first">
+        <editView v-if="showEdit" visible-key="showEdit" :_dataId.sync="dataId" :parent-target="_self"
+                  @reload="$reloadHandle"></editView>
+      </el-tab-pane>
+      <el-tab-pane :label="$t1('列表')" name="second">
+        <div class="grid-height">
+          <vxe-grid ref="table-m1" v-bind="vxeOption" @resizable-change="$vxeTableUtil.onColumnWitchChange"
+                    @custom="$vxeTableUtil.customHandle">
+            <template #form>
+              <div class="clearfix screen-btns">
+                <div class="fl">
+                  <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog">
+                    {{ $t1('新增') }}
+                  </vxe-button>
+                  <base-table-export :option="{ title: $t1('国家导出'), targetRef: 'table-m1'}" :parent-target="_self"/>
+                </div>
+                <div class="fr">
+                  <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 ref="form" class="screen-box" title-width="92px" title-align="right" :data="formData"
+                        @submit="searchEvent" @reset="searchEvent">
+                <vxe-form-item :title="$t1('国家名称')+':'" field="countryName">
+                  <template v-slot>
+                    <el-input v-model="formData.countryName" size="small" clearable/>
+                  </template>
+                </vxe-form-item>
+                <vxe-form-item :title="$t1('国家简称')+':'" field="simpleName">
+                  <template v-slot>
+                    <el-input v-model="formData.simpleName" size="small" clearable/>
+                  </template>
+                </vxe-form-item>
+                <vxe-form-item :title="$t1('国家编码')+':'" field="countryCode">
+                  <template v-slot>
+                    <el-input v-model="formData.countryCode" size="small" clearable/>
+                  </template>
+                </vxe-form-item>
+              </vxe-form>
+            </template>
+          </vxe-grid>
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import editView from './edit.vue';
+
+export default {
+  name: 'country:list',
+  components: {editView},
+  data() {
+    return {
+      activeName: 'second',
+      dataId: 0,
+      showEdit: false,
+      vxeOption: {},
+      formData: {}
+    };
+  },
+  mounted() {
+    this.initTableList();
+  },
+  methods: {
+    searchEvent() {
+      this.$refs['table-m1'].commitProxy('reload');
+    },
+    resetEvent() {
+      this.formData = {};
+      this.$refs['table-m1'].commitProxy('reload');
+    },
+    openEditDialog(id) {
+      this.dataId = !id || typeof id == 'object' ? 0 : id;
+      this.activeName = 'first';
+      this.$openEditView('showEdit');
+    },
+    initTableList() {
+      let that = this;
+      let tableOption = {
+        vue: this,
+        tableRef: 'table-m1',
+        tableName: 'user_country_list-m1',
+        path: USER_PREFIX + '/country/listPage',
+        param: () => {
+          return this.formData;
+        },
+        columns: [
+          {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
+          {
+            title: this.$t1('国家名称'),
+            field: 'countryName',
+            width: 250,
+            fixed: 'left'
+          },
+          {
+            field: 'simpleName',
+            title: this.$t1('国家简称'),
+            width: 150
+          },
+          {
+            field: 'countryCode',
+            title: this.$t1('国家编码'),
+            width: 150
+          },
+          {
+            field: 'enabled',
+            title: this.$t1('是否启用'),
+            width: 150,
+            slots: {
+              default: ({row}) => {
+                if (row.enabled) {
+                  return [
+                    <div class="txt-status">
+                      <span>{this.$t1('启用')}</span>
+                    </div>
+                  ];
+                } else {
+                  return [
+                    <div class="txt-status disable">
+                      <span>{this.$t1('禁用')}</span>
+                    </div>
+                  ];
+                }
+              }
+            }
+          },
+          {
+            field: 'createDate',
+            title: this.$t1('创建时间'),
+            width: 150
+          },
+          {
+            field: '_createBy',
+            title: this.$t1('创建人'),
+            width: 150
+          },
+          {
+            field: '_modifyBy',
+            title: this.$t1('更新人'),
+            width: 150
+          },
+          {
+            width: 47,
+            fixed: 'right',
+            title: '',
+            sortable: false,
+            slots: {
+              default: ({row}) => {
+                return [
+                  <div>
+                    <a
+                      href="javascript:void(0);"
+                      class="a-link"
+                      onclick={() => {
+                        this.openEditDialog(row.id);
+                      }}
+                    >
+                      <el-tooltip enterable={false} effect="dark" content={this.$t1('查看')} placement="top"
+                                  popper-class="tooltip-skin">
+                        <i class="el-icon-edit"/>
+                      </el-tooltip>
+                    </a>
+                  </div>
+                ];
+              }
+            }
+          }
+        ]
+      };
+      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+        this.vxeOption = opts;
+      });
+    },
+    importExcel() {
+      let that = this;
+      that.$excelImport({
+        prefix: USER_PREFIX,
+        excel: USER_PREFIX + '/excelTemplate/country/country.xlsx',
+        multi: false,
+        saveUrl: USER_PREFIX + '/country/save',
+        callback: () => {
+          that.searchEvent();
+        }
+      });
+    }
+  }
+};
+</script>

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

@@ -51,7 +51,6 @@
                 <el-select v-model="formData.dsType" clearable>
                   <el-option :value="0" label="mysql"></el-option>
                   <el-option :value="1" label="oracle"></el-option>
-						      <el-option :value="2" label="doris"></el-option>
                 </el-select>
               </template>
             </vxe-form-item>
@@ -157,8 +156,6 @@ export default {
                   return 'mysql';
                 } else if (row.dsType === 1) {
                   return 'oracle';
-                } else if (row.dsType === 2) {
-                  return 'doris';
                 }
               }
             }

package/src/views/user/extend_datasource/edit.vue

@@ -61,12 +61,11 @@
                 <em class="f-red">*</em>
                 {{ $t1('数据源类型') }}
               </th>
-              <td colspan="3">
+              <td>
                 <el-form-item prop="dsType" :rules="[{ required: true, trigger: 'blur' }]">
                   <el-radio-group v-model="dataSource.dsType">
                     <el-radio :label="0">mysql</el-radio>
                     <el-radio :label="1">oracle</el-radio>
-                    <el-radio :label="2">doris</el-radio>
                   </el-radio-group>
                 </el-form-item>
               </td>