cloud-web-corejs-haier 1.0.5 → 1.0.6

package/src/views/bd/setting/config_manage/list.vue

@@ -3,13 +3,23 @@
     <div class="flex">
       <div class="tab-box-vertical">
         <div class="list-scroll">
-          <div class="item" v-for="(item,index) in typeTabs" :key="item.name" :class="{on:item.name==activeName}"
-               @click="chooseTab(item)">{{ item.label }}
+          <div
+            class="item"
+            v-for="(item, index) in typeTabs"
+            :key="item.name"
+            :class="{ on: item.name == activeName }"
+            @click="chooseTab(item)"
+          >
+            {{ item.label }}
           </div>
         </div>
       </div>
       <div class="flex-tabboxWidth">
-        <div v-for="(item,index) in typeTabs" :key="item.name" v-show="item.name==activeName">
+        <div
+          v-for="(item, index) in typeTabs"
+          :key="item.name"
+          v-show="item.name == activeName"
+        >
           <component :is="item.name" :containtId="false" v-if="item.inited"></component>
         </div>
       </div>
@@ -25,6 +35,8 @@ import logic_param_list from "@base/views/bd/setting/logic_param/list.vue";
 import logic_param_list1 from "@base/views/bd/setting/logic_param/list1.vue";
 import logic_param_list2 from "@base/views/bd/setting/logic_param/list2.vue";
 
+import country_list from "@base/views/user/country/list.vue";
+import area_list from "@base/views/user/area/list.vue";
 
 export default {
   name: "list",
@@ -36,31 +48,36 @@ export default {
     logic_param_list,
     logic_param_list1,
     logic_param_list2,
+    country_list,
+    area_list,
   },
   data() {
     return {
       activeName: "bd_attach_setting_list",
       typeTabs: [
-        {label: this.$t1("导入模板"), name: "bd_attach_setting_list", inited: true},
-        {label: this.$t1("同步调用接口"), name: "request_setting_list", inited: false},
-        {label: this.$t1("异步推送数据"), name: "request_async_setting_list", inited: false},
-        {label: this.$t1("组织环境设置"), name: "bd_company_env_list", inited: false},
-         {label: this.$t1("逻辑参数"), name: "logic_param_list", inited: false},
-        /*{label: this.$t1("操作日志编码"), name: "logic_param_list1", inited: false},*/
-        {label: this.$t1("上传文件服务"), name: "logic_param_list2", inited: false},
-      ]
-    }
+        { label: this.$t1("导入模板"), name: "bd_attach_setting_list", inited: true },
+        { label: this.$t1("同步调用接口"), name: "request_setting_list", inited: false },
+        {
+          label: this.$t1("异步推送数据"),
+          name: "request_async_setting_list",
+          inited: false,
+        },
+        { label: this.$t1("组织环境设置"), name: "bd_company_env_list", inited: false },
+        { label: this.$t1("逻辑参数"), name: "logic_param_list", inited: false },
+        // {label: this.$t1("操作日志编码"), name: "logic_param_list1", inited: false},
+        { label: this.$t1("上传文件服务"), name: "logic_param_list2", inited: false },
+        { label: this.$t1("国家维护"), name: "country_list", inited: false },
+        { label: this.$t1("国家地区"), name: "area_list", inited: false },
+      ],
+    };
   },
   methods: {
     chooseTab(item) {
       this.activeName = item.name;
       item.inited = true;
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
-
-<style scoped>
-
-</style>
+<style scoped></style>

package/src/views/bd/setting/form_script/edit.vue

@@ -40,6 +40,15 @@
                 </td>
               </tr>
               <tr>
+                <th>{{ $t1('是否启用') }}</th>
+                <td>
+                  <el-form-item prop="enabled" :rules="[{ required: false, trigger: 'blur' }]">
+                    <el-radio-group v-model="formScript.enabled">
+                      <el-radio :label="true">{{ $t1('启用') }}</el-radio>
+                      <el-radio :label="false">{{ $t1('禁用') }}</el-radio>
+                    </el-radio-group>
+                  </el-form-item>
+                </td>
                 <th>{{ $t1('开启事务') }}</th>
                 <td>
                   <el-radio-group v-model="formScript.transactions">

package/src/views/bd/setting/form_script/edit1.vue

@@ -7,6 +7,16 @@
           {{ dataId ? $t1('查看表单脚本') : $t1('新增表单脚本') }}
         </div>
         <div class="fr">
+          <el-button
+            type="primary"
+            plain
+            class="button-sty"
+            icon="el-icon-set-up"
+            @click="openOtherAuthDialog"
+            v-if="isDev && !!dataId && menuKindAuth.editAuth === 1 && !readonly && !otherFlag && !formTemplate"
+          >
+            {{ $t1("分派") }}
+          </el-button>
           <el-button type="primary" plain class="button-sty" @click="$baseReload()" icon="el-icon-refresh-right">
             {{ $t1('重置') }}
           </el-button>
@@ -55,6 +65,7 @@
                       "
                       v-el-readonly
                       clearable
+                      :disabled="otherFlag"
                     >
                       <i slot="suffix" class="el-input__icon el-icon-search" @click="showMenuKindDialog = true"></i>
                     </el-input>
@@ -68,11 +79,15 @@
                 <td colspan="3">
                   <template v-if="!dataId && !formTemplate">
                     <el-radio-group v-model="formScript.formCode">
-                      <el-radio label="intf">intf</el-radio>
-                      <el-radio label="busgeneral">busgeneral</el-radio>
+                      <el-radio label="intf">intf(接口)</el-radio>
+                      <el-radio label="busgeneral">busgeneral(业务通用)</el-radio>
                     </el-radio-group>
                   </template>
-                  <span v-else>{{ formScript.formCode }}</span>
+                  <template v-else>
+                    <span v-if="formScript.formCode=='intf'">intf(接口)</span>
+                    <span v-else-if="formScript.formCode=='busgeneral'">busgeneral(业务通用)</span>
+                    <span v-else>{{ formScript.formCode }}</span>
+                  </template>
 
                 </td>
                 <th>{{ $t1('Url路径') }}</th>
@@ -81,6 +96,15 @@
                 </td>
               </tr>
               <tr>
+                <th>{{ $t1('是否启用') }}</th>
+                <td>
+                  <el-form-item prop="enabled" :rules="[{ required: false, trigger: 'blur' }]">
+                    <el-radio-group v-model="formScript.enabled">
+                      <el-radio :label="true">{{ $t1('启用') }}</el-radio>
+                      <el-radio :label="false">{{ $t1('禁用') }}</el-radio>
+                    </el-radio-group>
+                  </el-form-item>
+                </td>
                 <th>{{ $t1('开启事务') }}</th>
                 <td>
                   <el-radio-group v-model="formScript.transactions">
@@ -181,6 +205,8 @@
     <preformDialog v-if="showPreformDialog" :visiable.sync="showPreformDialog"
                    :formScript="formScript"
                    @confirm="confirmPreformDialog"></preformDialog>
+    <otherAuthDialog v-if="showOtherAuthDialog" :visiable.sync="showOtherAuthDialog" :sid="sid"
+                     @confirm="confirmOtherAuthDialog"></otherAuthDialog>
   </div>
 </template>
 

package/src/views/bd/setting/form_script/form_list.vue

@@ -2,32 +2,72 @@
   <div id="containt">
     <x-tabs ref="xTabs" v-model="activeName" class="tab-box">
       <el-tab-pane :label="$t1('常规')" name="first">
-        <editView v-if="showEdit" visible-key="showEdit" :_dataId.sync="dataId"
-                  :formCode="formTemplate.formCode" :formTemplate="formTemplate" :parent-target="_self"
-                  @reload="$reloadHandle"></editView>
+        <editView
+          v-if="showEdit"
+          visible-key="showEdit"
+          :_dataId.sync="dataId"
+          :formCode="formTemplate.formCode"
+          :formTemplate="formTemplate"
+          :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">
+          <vxe-grid
+            ref="table-m1"
+            v-bind="vxeOption"
+            @resizable-change="$vxeTableUtil.onColumnWitchChange"
+            @custom="$vxeTableUtil.customHandle"
+          >
             <template #form>
-              <tableForm :formData.sync="formData" @searchEvent="searchEvent" @resetEvent="resetEvent">
+              <tableForm
+                :formData.sync="formData"
+                @searchEvent="searchEvent"
+                @resetEvent="resetEvent"
+              >
                 <template #buttonLeft>
-                  <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog"
-                              v-if="isDev && menuKindAuth.editAuth===1">{{ $t1('新增') }}
+                  <vxe-button
+                    status="primary"
+                    class="button-sty"
+                    icon="el-icon-plus"
+                    @click="openEditDialog"
+                    v-if="isDev && menuKindAuth.addAuth === 1"
+                    >{{ $t1("新增") }}
                   </vxe-button>
-                  <projectTagAddButton :option="addProjectTagOption" v-if="isDev && menuKindAuth.editAuth===1"></projectTagAddButton>
-                  <projectTagDeleteButton :option="deleteProjectTagOption" v-if="isDev && menuKindAuth.editAuth===1"></projectTagDeleteButton>
-                  <el-button icon="el-icon-setting" class="button-sty" @click="showScriptDialog=true" type="success"
-                             v-if="isDev && menuKindAuth.editAuth===1"
-                  >{{ $t1('选择需要定制的后台脚本模板') }}
+                  <projectTagAddButton
+                    :option="addProjectTagOption"
+                    v-if="isDev && menuKindAuth.editAuth === 1"
+                  ></projectTagAddButton>
+                  <projectTagDeleteButton
+                    :option="deleteProjectTagOption"
+                    v-if="isDev && menuKindAuth.editAuth === 1"
+                  ></projectTagDeleteButton>
+                  <el-button
+                    icon="el-icon-setting"
+                    class="button-sty"
+                    @click="showScriptDialog = true"
+                    type="success"
+                    v-if="isDev && menuKindAuth.editAuth === 1"
+                    >{{ $t1("选择需要定制的后台脚本模板") }}
                   </el-button>
                 </template>
                 <template #buttonRight>
-                  <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>
                 </template>
                 <template #tag>
@@ -37,41 +77,63 @@
                         class="search-input"
                         max="200"
                         :value="getTabNames()"
-                        @clear="
-                            checkTags = [];
-                          "
+                        @clear="checkTags = []"
                         v-el-readonly
                         clearable
                       >
-                        <i slot="suffix" class="el-input__icon el-icon-search" @click="openProjectTagDialog3"></i>
+                        <i
+                          slot="suffix"
+                          class="el-input__icon el-icon-search"
+                          @click="openProjectTagDialog3"
+                        ></i>
                       </el-input>
                     </template>
                   </vxe-form-item>
                 </template>
               </tableForm>
             </template>
-            <template #tag="{row}">
-              <projectTagView v-model="row.formScriptTagDTOs" :readonly="true"></projectTagView>
+            <template #tag="{ row }">
+              <projectTagView
+                v-model="row.formScriptTagDTOs"
+                :readonly="true"
+              ></projectTagView>
             </template>
           </vxe-grid>
         </div>
       </el-tab-pane>
-      <template #editTab="{tab,index,reloadTabContent}">
-        <el-tab-pane :key="tab.data.id" :label.sync="tab.data.scriptName" :name="tab.data.id+''"
-                     :closable="true">
-          <editView v-if="tab.showContent" :_dataId="tab.dataId" :formCode="formTemplate.formCode"
-                    :formTemplate="formTemplate" :parent-target="_self"
-                    @reload="reloadTabContent"></editView>
+      <template #editTab="{ tab, index, reloadTabContent }">
+        <el-tab-pane
+          :key="tab.data.id"
+          :label.sync="tab.data.scriptName"
+          :name="tab.data.id + ''"
+          :closable="true"
+        >
+          <editView
+            v-if="tab.showContent"
+            :_dataId="tab.dataId"
+            :formCode="formTemplate.formCode"
+            :formTemplate="formTemplate"
+            :parent-target="_self"
+            @reload="reloadTabContent"
+          ></editView>
         </el-tab-pane>
       </template>
     </x-tabs>
-    <scriptDialog v-if="showScriptDialog" :visiable.sync="showScriptDialog" @confirm="confirmScriptDialog"
-                  :param="{ scriptType:99 }" :multi="true" :title="$t1('初始化模板脚本')"></scriptDialog>
-    <projectTagDialog v-if="showProjectTagDialog3"
-                      :visiable.sync="showProjectTagDialog3"
-                      @confirm="confirmProjectTagDialog3"
-                      :rows="checkTags"
-                      :multi="true"></projectTagDialog>
+    <scriptDialog
+      v-if="showScriptDialog"
+      :visiable.sync="showScriptDialog"
+      @confirm="confirmScriptDialog"
+      :param="{ scriptType: 99 }"
+      :multi="true"
+      :title="$t1('初始化模板脚本')"
+    ></scriptDialog>
+    <projectTagDialog
+      v-if="showProjectTagDialog3"
+      :visiable.sync="showProjectTagDialog3"
+      @confirm="confirmProjectTagDialog3"
+      :rows="checkTags"
+      :multi="true"
+    ></projectTagDialog>
   </div>
 </template>
 
@@ -79,7 +141,7 @@
 import mixin from "./mixins/form_list";
 
 export default {
-  name: 'form_script:form_list',
-  mixins: [mixin]
+  name: "form_script:form_list",
+  mixins: [mixin],
 };
 </script>