付费申请bug修复，金额保留2位

src/hooks/web/common.ts

@@ -156,13 +156,14 @@ export function formatParams(params = {}, equal: any = [], otherQuery: any = [])
         })
       }
       // 排除不是分页排序等字段
-      if (IsContinue && key != 'page' && key != 'pageSize' && key != 'order' && key != 'field') {
+      if (key != 'page' && key != 'pageSize' && key != 'order' && key != 'field') {
         if (key == 'advancedSearchParams') {
           // 高级查询
           conditions.push(params[key])
         } else {
           // 其他查询
           if (Array.isArray(params[key])) {
+            console.log(params[key])
             const isDate = new Date(params[key][0]) as any
             // 判定为日期
             if (isDate != 'Invalid Date' && isDate.getFullYear() > 1000) {
@@ -216,28 +217,35 @@ export function formatParams(params = {}, equal: any = [], otherQuery: any = [])
                   }
                 }
                 ConditionalList.ConditionalList.push(obj)
+                console.log(obj)
               })
               conditions.push(ConditionalList)
             }
           } else {
-            let isEqual = false
-            if (equal.length) {
-              isEqual = equal.includes(key)
-            }
+            console.log(1)
+            // let isEqual = false
+            // if (equal.length) {
+            //   isEqual = equal.includes(key)
+            // }
             // 其他普通查询(模糊/等于)  1-模糊  0-等于
             if (params[key] || params[key] === 0) {
-              conditions.push({
-                FieldName: key,
-                FieldValue: params[key],
-                ConditionalType: !isEqual ? 1 : 0,
-              })
+              console.log(key) 
+              console.log(otherQuery) 
+              if (otherQuery && otherQuery.includes(key) ) {
+
+              } else {
+                conditions.push({
+                  FieldName: key,
+                  FieldValue: params[key],
+                  ConditionalType: 1,
+                })
+              }
             }
           }
         }
       }
     }
   }
-  console.log(otherQueryCondition)
   // 排序
   if (params?.field) {
     postData.pageCondition.sortConditions = [

src/views/baseinfo/infoclient/index.vue

@@ -151,6 +151,7 @@
         })
         Rdata.queryCondition = JSON.stringify(etd)
       }
+      console.log(Rdata)
       return Rdata
     },
     columns,

src/views/baseinfo/port/columns.tsx

@@ -143,7 +143,7 @@ export const searchFormSchema: FormSchema[] = [
     component: 'Input',
     colProps: { span: 4 },
     componentProps: {
-      placeholder: '港口中文名字/港口英文名字/EDI代码',
+      placeholder: '港口中文名字/港口英文名字/EDI代码'
     }
   },
   {

src/views/baseinfo/port/index.vue

@@ -76,9 +76,7 @@
       })
     },
     beforeFetch: (p) => {
-      let RData = formatParams(p)
-      RData.queryCondition = RData.queryCondition.replace(`{"Key":1,"Value"`, `{"Key":0,"Value"`)
-      return RData
+      return formatParams(p)
     },
     columns,
     formConfig: {

src/views/operation/paidApply/detail/components/applyInfoColumns.tsx

@@ -89,12 +89,12 @@ export const columns: BasicColumn[] = [
   //   },
   {
     title: '揽货人',
-    dataIndex: 'note',
+    dataIndex: 'saleName',
     width: 110,
   },
   {
     title: '所属分部',
-    dataIndex: 'createTime',
+    dataIndex: 'saleDeptName',
     width: 120,
   },
 ]

src/views/operation/paidApply/detail/components/businessTable.vue

@@ -67,14 +67,14 @@
               <span class="title">未付USD:</span>
               <span class="count">{{ pusd }}</span>
             </span>
-            <span class="box">
+            <!-- <span class="box">
               <span class="title">未收其他:</span>
               <span class="count">{{ rother }}</span>
             </span>
             <span class="box">
               <span class="title">未付其他:</span>
               <span class="count">{{ pother }}</span>
-            </span>
+            </span> -->
           </div>
         </template>
       </BasicTable>
@@ -140,11 +140,13 @@
       const res = await GetBizList(p)
       res.data.forEach((item, index) => {
         item['idIndex'] = item.id + index
-        if (item['unpaidRMB']) item['unpaidRMB'] = numberThousandFormat(item['unpaidRMB'], 2, true)
-        if (item['unpaidUSD']) item['unpaidUSD'] = numberThousandFormat(item['unpaidUSD'], 2, true)
-        if (item['unBilledRMB']) item['unBilledRMB'] = numberThousandFormat(item['unBilledRMB'], 2, true)
-        if (item['unBilledUSD']) item['unBilledUSD'] = numberThousandFormat(item['unBilledUSD'], 2, true)
-        if (item['unreceivedTotal']) item['unreceivedTotal'] = numberThousandFormat(item['unreceivedTotal'], 2, true)
+        item['unpaidRMB'] = numberThousandFormat(item['unpaidRMB'], 2, true)
+        item['unpaidUSD'] = numberThousandFormat(item['unpaidUSD'], 2, true)
+        item['unreceivedRMB'] = numberThousandFormat(item['unreceivedRMB'], 2, true)
+        item['unreceivedUSD'] = numberThousandFormat(item['unreceivedUSD'], 2, true)
+        item['unBilledRMB'] = numberThousandFormat(item['unBilledRMB'], 2, true)
+        item['unBilledUSD'] = numberThousandFormat(item['unBilledUSD'], 2, true)
+        item['unreceivedTotal'] = numberThousandFormat(item['unreceivedTotal'], 2, true)
       })
       if (res?.data?.length) state.historyRowKeys = [res.data[0].id + 0]
       setSelectedRows([res.data[0]])
@@ -506,12 +508,13 @@
     pother.value = 0
     // 计算业务表合计
     rows.forEach(item => {
-      rrmb.value = rrmb.value + item.unreceivedRMB || 0
-      prmb.value = prmb.value + item.unpaidRMB || 0
-      rusd.value = rusd.value + item.unreceivedUSD || 0
-      pusd.value = pusd.value + item.unpaidUSD || 0
-      rother.value = rother.value + item.unreceivedOther || 0
-      pother.value = pother.value + item.unpaidOther || 0
+      rrmb.value = numberThousandFormat(rrmb.value + Number(item.unreceivedRMB) || 0, 2, true)
+      prmb.value = numberThousandFormat(prmb.value + Number(item.unpaidRMB) || 0, 2, true)
+      rusd.value = numberThousandFormat(rusd.value + Number(item.unreceivedUSD) || 0, 2, true)
+      pusd.value = numberThousandFormat(pusd.value + Number(item.unpaidUSD) || 0, 2, true)
+      // rother.value = rother.value + Number(item.unreceivedOther) || 0
+      // pother.value = pother.value + Number(item.unpaidOther) || 0
+
     })
   })
 

src/views/operation/paidApply/detail/components/exchangeRate.vue

@@ -9,30 +9,30 @@
       <div class="mt15">
         <div v-for="(item, index) in c2" :key="'cur' + index">
           <p class="flex">
-            <span class="unit">1{{ item.currency }} =</span>
+            <span class="unit">1{{ c1 }} =</span>
             <a-input-number
-              v-model:value="item.value"
+              v-model:value="item.value1"
               :min="0.000001"
               :max="99999999"
               :step="0.000001"
-              :precision="6"
               string-mode
-              @change="calc2($event, item)"
+              :precision="6"
+              @change="calc1($event, item)"
             />
-            {{ c1 }}
+            {{ item.currency }}
           </p>
           <p class="flex">
-            <span class="unit">1{{ c1 }} =</span>
+            <span class="unit">1{{ item.currency }} =</span>
             <a-input-number
-              v-model:value="item.value1"
+              v-model:value="item.value"
               :min="0.000001"
               :max="99999999"
               :step="0.000001"
-              string-mode
               :precision="6"
-              @change="calc1($event, item)"
+              string-mode
+              @change="calc2($event, item)"
             />
-            {{ item.currency }}
+            {{ c1 }}
           </p>
         </div>
       </div>
@@ -49,7 +49,6 @@
   const ctype = ref()
   const handleOk = () => {
     visible.value = false
-    console.log(c2.value)
     emit('submit', { list: c2.value, type: ctype.value })
   }
   // 业务币别
@@ -63,6 +62,8 @@
     }
     visible.value = true
     c1.value = currency
+    console.log(currency)
+    console.log(list)
     c2.value = list
     ctype.value = type
     c2.value.forEach(item => {