Merge branch 'cpq-dev' of wangfan/adweb3-web into master

src/views/adweb/site/AdwebSite.api.ts

@@ -114,6 +114,11 @@ export const isSohoeb2b = () => {
     userStore.getRoleList.includes(RoleEnum.ADWEB_CHANNEL_ADMIN) && userStore.getLoginInfo.tenantList.some((obj) => obj.name.includes('苏豪纺织集团'))
   );
 };
+
+export const isDeveloper = () => {
+  return userStore.getRoleList.includes(RoleEnum.ADMIN);
+};
+
 export const getSubscribePlan = () => {
   const params: Record<string, any> = {
     siteId: localStorage.getItem('siteID'),

src/views/adweb/site/AdwebSite.data.ts

@@ -1,6 +1,6 @@
 import { BasicColumn } from '/src/components/Table';
 import dayjs from 'dayjs';
-import { isSohoeb2b } from '@/views/adweb/site/AdwebSite.api';
+import { isDeveloper, isSohoeb2b } from '@/views/adweb/site/AdwebSite.api';
 
 //列表数据
 export const columns: BasicColumn[] = [
@@ -97,6 +97,19 @@ export const columns: BasicColumn[] = [
     align: 'left',
     dataIndex: 'etime',
   },
+  {
+    title: '正式服务器名称',
+    align: 'left',
+    dataIndex: 'prodServerName',
+    ifShow: isDeveloper(),
+  },
+
+  {
+    title: '正式服务器IP',
+    align: 'left',
+    dataIndex: 'prodServerIp',
+    ifShow: isDeveloper(),
+  },
 ];
 
 // 高级查询数据

src/views/adweb/site/AdwebSiteList.vue

@@ -34,11 +34,17 @@
           </a-col>
 
           <template v-if="toggleSearchStatus">
-            <!--            <a-col :xxl="12" :xl="10">-->
-            <!--              <a-form-item label="创建时间">-->
-            <!--                <j-range-date placeholder="请选择开始日期" class="query-group-cust" v-model:value="queryParam.ctime" />-->
-            <!--              </a-form-item>-->
-            <!--            </a-col>-->
+            <a-col v-if="isDeveloper" :xxl="6" :xl="7">
+              <a-form-item name="prodServerName" label="服务器名称">
+                <j-input placeholder="请输入正式服务器名称" v-model:value="queryParam.prodServerName" allow-clear />
+              </a-form-item>
+            </a-col>
+
+            <a-col v-if="isDeveloper" :xxl="6" :xl="7">
+              <a-form-item name="prodServerIp" label="服务器IP">
+                <j-input placeholder="请输入正式服务器IP" v-model:value="queryParam.prodServerIp" allow-clear />
+              </a-form-item>
+            </a-col>
 
             <!--            <a-col :xl="10" :lg="11" :md="12" :sm="24">-->
             <!--              <a-form-item label="到期时间">-->
@@ -224,6 +230,10 @@
     );
   });
 
+  const isDeveloper = computed(() => {
+    return userStore.getRoleList.includes(RoleEnum.ADMIN);
+  });
+
   // 租户管理员角色
   const isTenantAdmin = computed(() => {
     return userStore.getRoleList.includes(RoleEnum.ADWEB_CHANNEL_ADMIN);
@@ -307,7 +317,7 @@
    * 编辑事件
    */
   function handleEdit(record: Recordable) {
-    if (isAdmin.value) {
+    if (isDeveloper.value) {
       registerModal.value.disableSubmit = false;
       registerModal.value.edit(record);
     } else {

src/views/adweb/site/components/AdwebSiteForm.vue

@@ -24,6 +24,19 @@
                 <a-radio-group v-model:value="formData.isDomain" option-type="button" :options="isDomainList" />
               </a-form-item>
             </a-col>
+
+            <a-col :span="24" v-if="formData.status == 1">
+              <a-form-item label="正式服务名称" v-bind="validateInfos.prodServerName">
+                <a-input v-model:value="formData.prodServerName" placeholder="请输入正式服务名称" allow-clear />
+              </a-form-item>
+            </a-col>
+
+            <a-col :span="24" v-if="formData.status == 1">
+              <a-form-item label="正式服务IP" v-bind="validateInfos.prodServerIp">
+                <a-input v-model:value="formData.prodServerIp" placeholder="请输入正式服务IP" allow-clear />
+              </a-form-item>
+            </a-col>
+
             <a-col :span="24">
               <a-form-item label="站点域名" v-bind="validateInfos.domain">
                 <a-input v-model:value="formData.domain" placeholder="请输入站点域名" allow-clear />
@@ -98,6 +111,8 @@
     domainDev: '',
     etime: '',
     issueTime: '',
+    prodServerName: '',
+    prodServerIp: '',
   });
   const { createMessage } = useMessage();
   const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });