Merge branch 'dev' of http://60.209.125.238:20010/lijingjia/ds-wms-client-web into dev

src/hooks/web/common.ts

@@ -134,8 +134,8 @@ export function updateFormItem(updateSchema, formNo) {
 }
 
 // 返回表格查询的参数 multipleList(需要多选查询的字段名数组)
-export function formatParams(params = {}, equal:any = []) {
+export function formatParams(params = {}, equal: any = [], otherQuery: any = []) {
-  const postData = {
+  const postData:any = {
     queryCondition: '',
     pageCondition: {
       pageIndex: params?.page,
@@ -145,8 +145,17 @@ export function formatParams(params = {}, equal:any = []) {
   }
   const conditions = [] as any
   for (let key in params) {
+    let IsContinue = true
+    if (otherQuery.length) {
+      otherQuery.forEach((item) => {
+        if (key == item) {
+          IsContinue = false
+          postData.otherQueryCondition[key]=params[key]
+        }
+      })
+    }
     // 排除不是分页排序等字段
-    if (key != 'page' && key != 'pageSize' && key != 'order' && key != 'field') {
+    if (IsContinue && key != 'page' && key != 'pageSize' && key != 'order' && key != 'field') {
       if (key == 'advancedSearchParams') {
         // 高级查询
         conditions.push(params[key])

src/views/baseinfo/infoclient/ReleaseType/index.vue

@@ -2,7 +2,7 @@
   <div>
     <BasicTable class="ds-table-detail" @register="registerTable" @row-dbClick="handleAudit">
       <template #tableTitle>
-        <span class="放舱通道配置列表">自动费用模板</span>
+        <span class="title">放舱方式设置</span>
         <a-button type="link" @click="handleCreate" :disabled="checkPermissions('op:ctn:add')">
           <span class="iconfont icon-new_document"></span>
           添加
@@ -132,3 +132,16 @@
     reload()
   }
 </script>
+<style lang="less" scoped>
+  .ds-table-detail {
+    margin-top: -16px;
+    .title {
+      font-size: 12px;
+      font-weight: 700;
+      letter-spacing: 1px;
+      line-height: 15.84px;
+      color: rgba(51, 56, 61, 1);
+      text-align: left;
+    }
+  }
+</style>

src/views/baseinfo/infoclient/TenantAuditStepModal.vue

@@ -183,9 +183,9 @@
             <Menus3 :client-id="clientId" class="RUnit" />
           </a-tab-pane>
           <!-- 合同管理 -->
-          <a-tab-pane key="7" tab="固定费用">
+          <!-- <a-tab-pane key="7" tab="固定费用">
             <CustTemplateDetail :client-id="clientId" :customer-name="customerName" class="RUnit" />
-          </a-tab-pane>
+          </a-tab-pane> -->
           <!-- 客户参数表格 -->
           <a-tab-pane key="8" tab="客户参数">
             <CustomerParams :client-id="clientId" :customer-name="customerName"></CustomerParams>
@@ -226,7 +226,7 @@
   import Tabs3 from './tabs3/index.vue'
   import Menus2 from './menu2/index.vue'
   import Menus3 from './menu3/index.vue'
-  import CustTemplateDetail from './custTemplateDetail/index.vue'
+  // import CustTemplateDetail from './custTemplateDetail/index.vue'
   import FeeCustTemplate from './FeeCustTemplate/index.vue'
   import { useModal } from '/@/components/Modal'
   import CustomerParams from './customerParams/index.vue'

src/views/baseinfo/infoclient/tabs3/index.vue

@@ -2,7 +2,7 @@
   <div>
     <BasicTable class="ds-table-detail" @register="registerTable" :maxHeight="350">
       <template #tableTitle>
-        <span>账期信息</span>
+        <span class="title">账期信息</span>
         <a-button type="link" @click="handleCreate" :disabled="Fndisabled()">
           <span class="iconfont icon-new_document"></span>
           添加
@@ -175,12 +175,15 @@
   }
 </script>
 <style lang="less" scoped>
-  .title {
+  .ds-table-detail {
-    font-size: 12px;
+    margin-top: -16px;
-    font-weight: 700;
+    .title {
-    letter-spacing: 1px;
+      font-size: 12px;
-    line-height: 15.84px;
+      font-weight: 700;
-    color: rgba(51, 56, 61, 1);
+      letter-spacing: 1px;
-    text-align: left;
+      line-height: 15.84px;
+      color: rgba(51, 56, 61, 1);
+      text-align: left;
+    }
   }
 </style>

src/views/system/org/columns.tsx

@@ -1,5 +1,6 @@
 import { BasicColumn, FormSchema } from '/@/components/Table'
 import { Tag } from 'ant-design-vue'
+import { GetUserList } from '/@/api/common'
 import { useOptionsStore } from '/@/store/modules/options'
 const optionsStore = useOptionsStore()
 export const columns: BasicColumn[] = [
@@ -225,10 +226,17 @@ export const formSchema: FormSchema[] = [
   {
     label: '负责人',
     field: 'leader',
-    component: 'Input',
+    component: 'ApiSelect',
-    defaultValue: '',
+    colProps: { span: 6 },
-    colProps: {
+    componentProps: () => {
-      span: 6,
+      return {
+        api: GetUserList,
+        labelField: 'label',
+        valueField: 'label',
+        immediate: false,
+        resultField: 'data',
+        getPopupContainer: () => document.body,
+      }
     },
   },
   {
@@ -432,9 +440,9 @@ export const formSchema: FormSchema[] = [
       return !!values.id
     },
     colProps: {
-      span: 24
+      span: 24,
-    }
+    },
-  }
+  },
 ]
 
 export const BankColumns: BasicColumn[] = [
@@ -647,7 +655,7 @@ export const BankformSchema: FormSchema[] = [
       options: [
         { label: '启用', value: 1 },
         { label: '禁用', value: 0 },
-      ]
+      ],
     },
     defaultValue: true,
     colProps: {

src/views/system/org/index.vue

@@ -1,8 +1,3 @@
-<!--
- * @Desc: 机构管理列表页面
- * @Author: lijj
- * @Date: 2024-07-17 08:39:51
--->
 <template>
   <div class="ds-org-manage">
     <BasicTable class="ds-table" @register="registerTable" @row-dbClick="handleEdit">
@@ -35,7 +30,9 @@
       </template>
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'orgName'">
-          <span style="color: #0d84ff; cursor: pointer;" @click="handleEdit(record)">{{ record.orgName }}</span>
+          <span style="color: #0d84ff; cursor: pointer" @click="handleEdit(record)">{{
+            record.orgName
+          }}</span>
         </template>
         <template v-if="column.key === 'action'">
           <TableAction

src/views/taskmanage/index.vue

@@ -405,33 +405,15 @@ function getCurrentTotalStat() {
                 bussObj = queryData[i].FieldValue
                 queryData.splice(i, 1);
             } else
-            if (queryData[i].FieldName === 'portloaD_CODE') {
+                if (queryData[i].FieldName === 'portloaD_CODE') {
-                str1 = queryData[i].FieldValue
+                    str1 = queryData[i].FieldValue
-                queryData.splice(i, 1);
+                    queryData.splice(i, 1);
-            } else
+                } else
-            if (queryData[i].FieldName === 'portdischargE_CODE') {
+                    if (queryData[i].FieldName === 'portdischargE_CODE') {
-                str2 = queryData[i].FieldValue
+                        str2 = queryData[i].FieldValue
-                queryData.splice(i, 1);
+                        queryData.splice(i, 1);
-            }
+                    }
         }
-        // for (let i = 0; i < queryData.length; i++) {
-        //     if (queryData[i].FieldName === 'businessNo') {
-        //         bussObj = queryData[i].FieldValue
-        //         queryData.splice(i, 1)
-        //         i--
-        //     }
-        //     if (queryData[i].FieldName === 'portloaD_CODE') {
-        //         str1 = queryData[i].FieldValue
-        //         queryData.splice(i, 1)
-        //         i--
-        //     }
-        //     if (queryData[i].FieldName === 'portdischargE_CODE') {
-        //         str2 = queryData[i].FieldValue
-        //         queryData.splice(i, 1)
-        //         i--
-        //     }
-        // }
-        console.log(queryData, 123123);
     }
     const data = {
         isReCalc: false,
@@ -488,9 +470,36 @@ function openFile() {
 function refshTotalStat() {
     levelreLoading.value = true
     levelLoading.value = true
+    let bussObj = ''
+    let str1 = ''
+    let str2 = ''
+    let queryData = formatParams(getForm().getFieldsValue()).queryCondition
+    if (queryData) {
+        queryData = JSON.parse(queryData)
+        let i = queryData.length;
+        while (i--) {
+            if (queryData[i].FieldName === 'businessNo') {
+                bussObj = queryData[i].FieldValue
+                queryData.splice(i, 1);
+            } else
+                if (queryData[i].FieldName === 'portloaD_CODE') {
+                    str1 = queryData[i].FieldValue
+                    queryData.splice(i, 1);
+                } else
+                    if (queryData[i].FieldName === 'portdischargE_CODE') {
+                        str2 = queryData[i].FieldValue
+                        queryData.splice(i, 1);
+                    }
+        }
+    }
     GetCurrentTotalStat({
         isReCalc: false,
-        ...getForm().getFieldsValue()
+        queryCondition: JSON.stringify(queryData),
+        otherQueryCondition: {
+            businessNo: bussObj,
+            portloaD_CODE: str1,
+            portdischargE_CODE: str2
+        }
     })
         .then(res => {
             levelLoading.value = false
@@ -710,23 +719,23 @@ const [registerTable, { reload, setProps, getForm, getSelectRows, setColumns }]
                 bussObj = queryData[i].FieldValue
                 queryData.splice(i, 1);
             } else
-            if (queryData[i].FieldName === 'portloaD_CODE') {
+                if (queryData[i].FieldName === 'portloaD_CODE') {
-                str1 = queryData[i].FieldValue
+                    str1 = queryData[i].FieldValue
-                queryData.splice(i, 1);
+                    queryData.splice(i, 1);
-            } else
+                } else
-            if (queryData[i].FieldName === 'portdischargE_CODE') {
+                    if (queryData[i].FieldName === 'portdischargE_CODE') {
-                str2 = queryData[i].FieldValue
+                        str2 = queryData[i].FieldValue
-                queryData.splice(i, 1);
+                        queryData.splice(i, 1);
-            } else
+                    } else
-            if (queryData[i].FieldName === 'task_TYPE') {
+                        if (queryData[i].FieldName === 'task_TYPE') {
-                queryData[i].ConditionalType = 0
+                            queryData[i].ConditionalType = 0
-            } else
+                        } else
-            if (queryData[i].FieldName === 'taskRecvName') {
+                            if (queryData[i].FieldName === 'taskRecvName') {
-                queryData[i].ConditionalType = 0
+                                queryData[i].ConditionalType = 0
-            } else
+                            } else
-            if (queryData[i].FieldName === 'taskSource') {
+                                if (queryData[i].FieldName === 'taskSource') {
-                queryData[i].ConditionalType = 0
+                                    queryData[i].ConditionalType = 0
-            }
+                                }
         }
         data.queryCondition = JSON.stringify(queryData)
         data.otherQueryCondition = {}