diff --git a/src/stores/Invoice.js b/src/stores/Invoice.js index f06405e..97ddd23 100644 --- a/src/stores/Invoice.js +++ b/src/stores/Invoice.js @@ -75,12 +75,9 @@ class Invoice { }; }); this.invoicePage.total = json.Result[0].TotalCount; + } else { + this.invoiceList = []; } - - // else{ - // this.invoiceList=[]; - // this.invoicePage.total=0; - // } } else { throw new Error(json.errmsg + ": " + json.errcode); } diff --git a/src/views/feedback/Detail.jsx b/src/views/feedback/Detail.jsx index b9cefd6..368cbf3 100644 --- a/src/views/feedback/Detail.jsx +++ b/src/views/feedback/Detail.jsx @@ -170,7 +170,7 @@ function Detail() { name="ghhfile" accept="image/*" multiple={true} - action={config.HT_HOST + `/service-fileServer/FileUpload?GRI_SN=${GRI_SN}&VEI_SN=${authStore.login.travelAgencyId}`} + action={config.HT_HOST + `/service-fileServer/FileUpload?GRI_SN=${GRI_SN}&VEI_SN=${authStore.login.travelAgencyId}&token=${authStore.login.token}`} fileList={fileList} listType="picture-card" onChange={handleChange} diff --git a/src/views/invoice/Detail.jsx b/src/views/invoice/Detail.jsx index 0cd3dfa..f615923 100644 --- a/src/views/invoice/Detail.jsx +++ b/src/views/invoice/Detail.jsx @@ -221,7 +221,7 @@ function Detail() { name="ghhfile" accept="image/*" multiple={true} - action={config.HT_HOST + `/service-fileServer/FileUpload?GRI_SN=${GSN}&VEI_SN=${authStore.login.travelAgencyId}&FilePathName=invoice`} + action={config.HT_HOST + `/service-fileServer/FileUpload?GRI_SN=${GSN}&VEI_SN=${authStore.login.travelAgencyId}&FilePathName=invoice&token=${authStore.login.token}`} fileList={invoicePicList[index]} listType="picture-card" > diff --git a/src/views/invoice/Index.jsx b/src/views/invoice/Index.jsx index 717af3a..d4c927e 100644 --- a/src/views/invoice/Index.jsx +++ b/src/views/invoice/Index.jsx @@ -26,14 +26,8 @@ function Index() { key: "GroupName", render: (text, record) => {text}, }, - { - title: "离团时间", - dataIndex: "GetGDate", - key: "GetGDate", - render: (text, record) => formatDate(new Date(text)), - }, - { - title: "接团时间", + { + title: "Arrival Date", key: "LeftGDate", dataIndex: "LeftGDate", render: (text, record) => (isNotEmpty(text) ? formatDate(new Date(text)) : ""), @@ -48,17 +42,6 @@ function Index() { key: "AllMoney", dataIndex: "AllMoney", }, - { - title: "填表时间", - key: "GMD_FWks_LastEditTime", - dataIndex: "GMD_FWks_LastEditTime", - render: (text, record) => (isNotEmpty(text) ? formatDate(new Date(text)) : ""), - }, - { - title: "填表人", - key: "GMD_FillWorkers_Name", - dataIndex: "GMD_FillWorkers_Name", - }, { title: "账单状态", key: "status",