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

src/views/ContainerManagement/CheckCntrno/index.vue

@@ -8,14 +8,18 @@
       <a-button type="primary" class="CheckButton" @click="FnCheck">确认校验</a-button>
     </div>
     <a-row class="BottomBox" type="flex" justify="space-between">
-      <a-col :span="11">
+      <a-col :span="7">
         <p>已通过箱号</p>
         <a-textarea :rows="20" v-model:value="passData" />
       </a-col>
-      <a-col :span="11">
+      <a-col :span="7">
         <p>未通过箱号</p>
         <a-textarea :rows="20" v-model:value="failData" />
       </a-col>
+      <a-col :span="7">
+        <p>正确箱号</p>
+        <a-textarea :rows="20" v-model:value="trueData" />
+      </a-col>
     </a-row>
   </div>
 </template>
@@ -27,6 +31,7 @@
   let waitingData = ref()
   let passData = ref()
   let failData = ref()
+  let trueData = ref()
   function ArrToStr(data) {
     let RData = ''
     data.forEach((item) => {
@@ -40,6 +45,7 @@
         console.log(res)
         failData.value = ArrToStr(res.data.wrongCntrnoList)
         passData.value = ArrToStr(res.data.rightCntrnoList)
+        trueData.value = ArrToStr(res.data.trueCntrnoList)
         notification.success({ message: '校验完成', duration: 3 })
       })
       .catch((err) => {
@@ -49,7 +55,7 @@
 </script>
 <style lang="less" scoped>
   .mainBox {
-    padding: 5% 55% 5% 5%;
+    padding: 5% 5% 5% 5%;
     display: flex;
     flex-direction: column;
     // align-items: center;
@@ -57,10 +63,10 @@
     background-repeat: no-repeat;
     background-position: right;
     .TopBox {
-      width: 1000px;
+      width: 70%;
     }
     .ButtonBox {
-      width: 1000px;
+      width: 70%;
       display: flex;
       justify-content: end;
       .CheckButton {
@@ -70,7 +76,7 @@
     }
 
     .BottomBox {
-      width: 1000px;
+      width: 70%;
     }
     p {
       margin: 0;

src/views/ContainerManagement/RentOneWayIn/TenantAuditStepModal.vue

@@ -552,6 +552,7 @@
       width: 120,
       data: 'rentDirect',
       type: 'dropdown',
+      readOnly: true,
       source: async (query, process) => {
         const res = rentDirectDict.value.length
           ? rentDirectDict.value
@@ -568,6 +569,7 @@
       width: 120,
       data: 'rentType',
       type: 'dropdown',
+      readOnly: true,
       source: async (query, process) => {
         const res = rentTypeDict.value.length
           ? rentTypeDict.value

src/views/baseinfo/TaskMail/TenantAuditStepModal.vue

@@ -79,12 +79,14 @@
     if (DiyFieldIdS.value.length) {
       DiyFieldIdS.value.forEach((item) => {
         removeSchemaByField(item.value)
+        removeSchemaByField(`${item.value}-fileType`)
       })
     }
 
     DiyFieldIdS.value.splice(0)
     data.forEach((item) => {
       appendSchemaByField(
+        [
           {
             field: item.value,
             label: item.label,
@@ -94,6 +96,31 @@
               placeholder: '自定义文件名称',
             },
           },
+          {
+            field: `${item.value}-fileType`,
+            label: `${item.label}-文件类型`,
+            component: 'Select',
+            colProps: { span: 6 },
+            componentProps: {
+              placeholder: '自定义文件类型',
+              allowClear: true,
+              options: [
+                {
+                  label: 'PDF',
+                  value: 1,
+                },
+                {
+                  label: 'Excel',
+                  value: 2,
+                },
+                {
+                  label: 'Word',
+                  value: 3,
+                },
+              ],
+            },
+          },
+        ],
         'attachments',
       )
       DiyFieldIdS.value.push(item)
@@ -140,6 +167,7 @@
     isUpdate.value = !!data?.isUpdate
     DiyFieldIdS.value.forEach((item) => {
       removeSchemaByField(item.value)
+      removeSchemaByField(`${item.value}-fileType`)
     })
     DiyFieldIdS.value.splice(0)
     if (unref(isUpdate)) {
@@ -167,6 +195,7 @@
                 label: element.templateName,
               })
               DiyFieldIdSObj[e.templateId] = e.fileName
+              DiyFieldIdSObj[`${e.templateId}-fileType`] = e.fileType
             }
           })
         })
@@ -205,6 +234,7 @@
   function handlecloseModal() {
     DiyFieldIdS.value.forEach((item) => {
       removeSchemaByField(item.value)
+      removeSchemaByField(`${item.value}-fileType`)
     })
     closeModal()
   }
@@ -232,6 +262,7 @@
               taskMailId: values.id,
               templateId: item.id,
               fileName: values[item.id] ? values[item.id] : item.templateName,
+              fileType: values[`${item.id}-fileType`],
             })
           }
         })
@@ -272,6 +303,7 @@
   async function refresh() {
     DiyFieldIdS.value.forEach((item) => {
       removeSchemaByField(item.value)
+      removeSchemaByField(`${item.value}-fileType`)
     })
     DiyFieldIdS.value.splice(0)
     const res: API.DataResult = await ApiInfo({ id: unref(rowId) })

src/views/fee/exchangeRate/columns.tsx

@@ -11,7 +11,7 @@ export const columns: BasicColumn[] = [
   {
     title: '币别',
     dataIndex: 'currencyCode',
-    width: 100
+    width: 100,
   },
   {
     title: '开始日期',
@@ -21,7 +21,7 @@ export const columns: BasicColumn[] = [
       if (text) {
         return text.split(' ')[0]
       }
-    }
+    },
   },
   {
     title: '结束日期',
@@ -31,27 +31,27 @@ export const columns: BasicColumn[] = [
       if (text) {
         return text.split(' ')[0]
       }
-    }
+    },
   },
   {
     title: '应收汇率',
     dataIndex: 'drValue',
-    width: 120
+    width: 120,
   },
   {
     title: '应付汇率',
     dataIndex: 'crValue',
-    width: 120
+    width: 120,
   },
   {
     title: '海关汇率',
     dataIndex: 'customValue',
-    width: 120
+    width: 120,
   },
   {
     title: '本币位',
     dataIndex: 'localCurrency',
-    width: 120
+    width: 120,
   },
   {
     title: '录入时间',
@@ -61,13 +61,13 @@ export const columns: BasicColumn[] = [
       if (text) {
         return text.split(' ')[0]
       }
-    }
+    },
   },
   {
     title: '备注',
     dataIndex: 'note',
-    width: 150
-  }
+    width: 150,
+  },
 ]
 
 export const searchFormSchema: FormSchema[] = [
@@ -81,10 +81,10 @@ export const searchFormSchema: FormSchema[] = [
         api: GetFeeCurrencySelectList,
         labelField: 'name',
         valueField: 'codeName',
-        resultField: 'data'
-      }
-    }
+        resultField: 'data',
       }
+    },
+  },
 ]
 export const formSchema: FormSchema[] = [
   {
@@ -92,7 +92,7 @@ export const formSchema: FormSchema[] = [
     field: 'id',
     component: 'Input',
     defaultValue: '',
-    show: false
+    show: false,
   },
   {
     field: 'currencyCode',
@@ -108,10 +108,10 @@ export const formSchema: FormSchema[] = [
         resultField: 'data',
         onChange: (v) => {
           formModel.currencyCode = v
-        }
-      }
+        },
       }
     },
+  },
   {
     field: 'startDate',
     label: '开始日期',
@@ -124,8 +124,8 @@ export const formSchema: FormSchema[] = [
     componentProps: {
       showTime: false,
       valueFormat: 'YYYY-MM-DD',
-      width: '100%'
-    }
+      width: '100%',
+    },
   },
   {
     field: 'endDate',
@@ -141,8 +141,8 @@ export const formSchema: FormSchema[] = [
       valueFormat: 'YYYY-MM-DD',
       disabledDate: (current: dayjs.Dayjs) => {
         return current && current < dayjs().add(-1, 'day').endOf('day')
-      }
-    }
+      },
+    },
   },
   {
     field: 'drValue',
@@ -150,11 +150,17 @@ export const formSchema: FormSchema[] = [
     defaultValue: '',
     component: 'InputNumber',
     colProps: { span: 12 },
-    componentProps: {
+    componentProps: ({ formModel }) => {
+      return {
         min: 0,
-      precision: 2
+        precision: 6,
+        onChange: (e) => {
+          formModel.crValue = e
+          formModel.customValue = e
+        },
       }
     },
+  },
   {
     field: 'crValue',
     label: '应付汇率',
@@ -163,8 +169,8 @@ export const formSchema: FormSchema[] = [
     colProps: { span: 12 },
     componentProps: {
       min: 0,
-      precision: 2
-    }
+      precision: 6,
+    },
   },
   {
     field: 'customValue',
@@ -174,21 +180,21 @@ export const formSchema: FormSchema[] = [
     colProps: { span: 12 },
     componentProps: {
       min: 0,
-      precision: 2
-    }
+      precision: 6,
+    },
   },
   {
     field: 'localCurrency',
     label: '本币位',
     defaultValue: '',
     component: 'Input',
-    colProps: { span: 12 }
+    colProps: { span: 12 },
   },
   {
     field: 'note',
     label: '备注',
     defaultValue: '',
     component: 'Input',
-    colProps: { span: 12 }
-  }
+    colProps: { span: 12 },
+  },
 ]