Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/components/Detail/src/Detail.vue

@@ -938,7 +938,10 @@ const handleDelete = async (id: number) => {
     // 刷新列表
     await getList()
     updateKey.value += 1
-  } catch {}
+  } catch {
+    tableObject.loading = false
+    getList()
+  }
 }
 // 筛选提交
 const searchFormClick = async (searchData) => {

src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue

@@ -393,6 +393,9 @@ const submitForm = async (formType, data) => {
       await RelegateRequestMainApi.createRelegateRequestMain(data)
       message.success(t('common.createSuccess'))
     } else {
+    if(data.masterId){
+      data.id = data.masterId
+    }
       await RelegateRequestMainApi.updateRelegateRequestMain(data)
       message.success(t('common.updateSuccess'))
     }

src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts

@@ -668,7 +668,7 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.REQUEST_STATUS,
     dictClass: 'string',
     isForm: false,
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     isTableForm: false,
   },

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts

@@ -48,17 +48,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'InputNumber',
     }
   },
-  {
+  
-    label: '财务凭证号',
-    field: 'voucher_number',
-    sort: 'custom',
-    table: {
-      width: 180,
-    },
-    isTable:false,
-    sortTableDefault:6,
-    isForm: false
-  },
   
   {
     label: '状态',
@@ -328,7 +318,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault:10
   },
   {
-    label: '过账日期',
+    label: '过账时间',
     field: 'postingDate',
     formatter: dateFormatter,
     detail: {
@@ -341,6 +331,17 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180
     }
   },
+  {
+    label: '财务凭证号',
+    field: 'voucherNumber',
+    sort: 'custom',
+    table: {
+      width: 180,
+    },
+    isTable:true,
+    sortTableDefault:6,
+    isForm: false
+  },
   {
     label: '业务类型',
     field:'businessType',
@@ -899,7 +900,7 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '凭证号',
+    label: '财务凭证号',
     field: 'voucherNumber',
     sort: 'custom',
     table: {