src/views/business/crm/company/formView.vue

@@ -1717,7 +1717,7 @@ function upload(param) {
   uploadFile(formData).then((res) => {
     if (res.code === 200) {
       const file = {};
-      file.fileName = res.newFileName;
+      file.fileName = res.originalFilename;
       file.fileType =
         res.newFileName.split(".")[res.newFileName.split(".").length - 1];
       file.url = res.url;

src/views/business/crm/order/form.vue

@@ -1691,7 +1691,7 @@ function upload(param) {
   uploadFile(formData).then((res) => {
     if (res.code === 200) {
       const file = {};
-      file.fileName = res.newFileName;
+      file.fileName = res.originalFilename;
       file.url = res.url;
       file.originalFileName = res.originalFilename;
       file.fileUrl = res.fileName;

src/views/business/crm/order/formView.vue

@@ -1607,7 +1607,7 @@
     uploadFile(formData).then((res) => {
       if (res.code === 200) {
         const file = {};
-        file.fileName = res.newFileName;
+        file.fileName = res.originalFilename;
         file.url = res.url;
         file.originalFileName = res.originalFilename;
         file.fileUrl = res.fileName;

src/views/business/crm/order/index.vue

@@ -93,10 +93,13 @@
           }}</template>
       </el-table-column>
       <el-table-column label="签单人" align="center" prop="signerName" min-width="120" />
+      <el-table-column label="合同状态" width="110" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :options="contract_status" :value="scope.row.status" />
+        </template>
+      </el-table-column>
       <el-table-column label="合同来源" align="center" prop="sourceCategoryName" min-width="120" />
-      <el-table-column label="客户标签" align="center" prop="customerLabelName" min-width="120" />
 
-      <el-table-column label="甲方" align="center" prop="boss" min-width="120" />
 
       <el-table-column label="合同类型" align="center" prop="contractType" width="80">
         <template #default="scope">
@@ -108,11 +111,10 @@
           {{ scope.row.serviceType === 1 ? "循环" : "代办" }}
         </template>
       </el-table-column>
-      <el-table-column label="合同状态" width="110" align="center" prop="status">
-        <template #default="scope">
-          <dict-tag :options="contract_status" :value="scope.row.status" />
-        </template>
-      </el-table-column>
+      <el-table-column label="客户标签" align="center" prop="customerLabelName" min-width="120" />
+
+      <el-table-column label="甲方" align="center" prop="boss" min-width="120" />
+      
       <el-table-column label="操作" fixed="right" align="center" width="130" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" size="small" @click="handleUpdate(scope.row)"

src/views/business/deduction/fileDialog.vue

@@ -136,7 +136,7 @@
         uploadFile(formData).then((res) => {
             if (res.code === 200) {
                 const file = {};
-                file.fileName = res.newFileName;
+                file.fileName = res.originalFilename;
                 file.url = res.url;
                 file.originalFileName = res.originalFilename;
                 file.fileUrl = res.fileName;

src/views/business/deduction/index.vue

@@ -639,7 +639,7 @@
     uploadFile(formData).then((res) => {
       if (res.code === 200) {
         const file = {};
-        file.fileName = res.newFileName;
+        file.fileName = res.originalFilename;
         file.url = res.url;
         file.originalFileName = res.originalFilename;
         file.fileUrl = res.fileName;
@@ -656,7 +656,7 @@
   //   uploadFile(formData).then((res) => {
   //     if (res.code === 200) {
   //       const file = {};
-  //       file.fileName = res.newFileName;
+  //       file.fileName = res.originalFilename;
   //       file.url = res.url;
   //       file.originalFileName = res.originalFilename;
   //       file.fileUrl = res.fileName;

src/views/business/entrust/deposit/index.vue

@@ -340,7 +340,7 @@
     uploadFile(formData).then((res) => {
       if (res.code === 200) {
         const file = {};
-        file.fileName = res.newFileName;
+        file.fileName = res.originalFilename;
         file.url = res.url;
         file.originalFileName = res.originalFilename;
         file.fileUrl = res.fileName;

src/views/business/entrust/depositOfFactory/index.vue

@@ -347,7 +347,7 @@
     uploadFile(formData).then((res) => {
       if (res.code === 200) {
         const file = {};
-        file.fileName = res.newFileName;
+        file.fileName = res.originalFilename;
         file.url = res.url;
         file.originalFileName = res.originalFilename;
         file.fileUrl = res.fileName;

src/views/business/financial/collection/form.vue

@@ -689,7 +689,7 @@
     uploadFile(fileForm).then((res) => {
       if (res.code === 200) {
         const file = {};
-        file.fileName = res.newFileName;
+        file.fileName = res.originalFilename;
         file.url = res.url;
         file.originalFileName = res.originalFilename;
         file.fileUrl = res.fileName;
@@ -704,7 +704,7 @@
     uploadFile(formData).then((res) => {
       if (res.code === 200) {
         const file = {};
-        file.fileName = res.newFileName;
+        file.fileName = res.originalFilename;
         file.url = res.url;
         file.fileType =
           res.newFileName.split(".")[res.newFileName.split(".").length - 1];

src/views/business/financial/contract/form.vue

@@ -603,7 +603,7 @@
     uploadFile(fileForm).then((res) => {
       if (res.code === 200) {
         const file = {};
-        file.fileName = res.newFileName;
+        file.fileName = res.originalFilename;
         file.url = res.url;
         file.originalFileName = res.originalFilename;
         file.fileUrl = res.fileName;

src/views/business/financial/payment/form.vue

@@ -727,7 +727,7 @@
     uploadFile(formData).then((res) => {
       if (res.code === 200) {
         const file = {};
-        file.fileName = res.newFileName;
+        file.fileName = res.originalFilename;
         file.url = res.url;
         file.fileType =
           res.newFileName.split(".")[res.newFileName.split(".").length - 1];
@@ -746,7 +746,7 @@
     uploadFile(formData).then((res) => {
       if (res.code === 200) {
         const file = {};
-        file.fileName = res.newFileName;
+        file.fileName = res.originalFilename;
         file.url = res.url;
         file.fileType =
           res.newFileName.split(".")[res.newFileName.split(".").length - 1];
@@ -843,7 +843,7 @@
     uploadFile(fileForm).then((res) => {
       if (res.code === 200) {
         const file = {};
-        file.fileName = res.newFileName;
+        file.fileName = res.originalFilename;
         file.url = res.url;
         file.originalFileName = res.originalFilename;
         file.fileUrl = res.fileName;

src/views/business/housingFund/confirm/form.vue

@@ -643,7 +643,7 @@
           proxy.$modal.msgError("文件类型错误,只能上传png,jpg格式");
           return;
         }
-        file.fileName = res.newFileName;
+        file.fileName = res.originalFilename;
         file.url = res.url;
         file.originalFileName = res.originalFilename;
         file.fileUrl = res.fileName;
@@ -710,7 +710,7 @@
           proxy.$modal.msgError("文件类型错误,只能上传png,jpg格式");
           return;
         }
-        file.fileName = res.newFileName;
+        file.fileName = res.originalFilename;
         file.url = res.url;
         file.originalFileName = res.originalFilename;
         file.fileUrl = res.fileName;

src/views/business/housingFund/declare/form.vue

@@ -444,7 +444,7 @@
     uploadFile(formData).then((res) => {
       if (res.code === 200) {
         const file = {};
-        file.fileName = res.newFileName;
+        file.fileName = res.originalFilename;
         file.evidenceFileType =
           res.newFileName.split(".")[res.newFileName.split(".").length - 1];
         file.url = res.url;

src/views/business/housingFund/declare/view.vue

@@ -458,7 +458,7 @@
     uploadFile(formData).then((res) => {
       if (res.code === 200) {
         const file = {};
-        file.fileName = res.newFileName;
+        file.fileName = res.originalFilename;
         file.url = res.url;
         file.originalFileName = res.originalFilename;
         file.fileUrl = res.fileName;

src/views/business/invoice/form.vue

@@ -567,7 +567,7 @@
         uploadFile(formData).then((res) => {
             if (res.code === 200) {
                 const file = {};
-                file.fileName = res.newFileName;
+                file.fileName = res.originalFilename;
                 file.url = res.fileName;
                 file.originalFileName = res.originalFilename;
                 file.fileUrl = res.fileName;

src/views/business/production/IndividualIncomeTaxIs/FormDialog.vue

@@ -480,7 +480,7 @@
     uploadFile(formData).then((res) => {
       if (res.code === 200) {
         const file = {};
-        file.fileName = res.newFileName;
+        file.fileName = res.originalFilename;
         file.url = res.fileName;
         file.originalFileName = res.originalFilename;
         file.fileUrl = res.fileName;

src/views/business/production/IndividualIncomeTaxIsZero/FormDialog.vue

@@ -383,7 +383,7 @@
     uploadFile(formData).then((res) => {
       if (res.code === 200) {
         const file = {};
-        file.fileName = res.newFileName;
+        file.fileName = res.originalFilename;
         file.url = res.url;
         file.originalFileName = res.originalFilename;
         file.fileUrl = res.fileName;

src/views/business/production/archiveTicket/index.vue

@@ -374,7 +374,7 @@
     uploadFile(formData).then((res) => {
       if (res.code === 200) {
         const file = {};
-        file.fileName = res.newFileName;
+        file.fileName = res.originalFilename;
         file.url = res.url;
         file.originalFileName = res.originalFilename;
         file.fileUrl = res.fileName;

src/views/business/production/archiveTicket/view.vue

@@ -185,7 +185,7 @@
     uploadFile(formData).then((res) => {
       if (res.code === 200) {
         const file = {};
-        file.fileName = res.newFileName;
+        file.fileName = res.originalFilename;
         file.url = res.url;
         file.originalFileName = res.originalFilename;
         file.fileUrl = res.fileName;

src/views/business/production/deduction/index.vue

@@ -290,7 +290,7 @@
     uploadFile(formData).then((res) => {
       if (res.code === 200) {
         const file = {};
-        file.fileName = res.newFileName;
+        file.fileName = res.originalFilename;
         file.url = res.url;
         file.originalFileName = res.originalFilename;
         file.fileUrl = res.fileName;

src/views/business/production/fileUpload/detail.vue

@@ -328,7 +328,7 @@
     uploadFile(formData).then((res) => {
       if (res.code === 200) {
         const file = {};
-        file.fileName = res.newFileName;
+        file.fileName = res.originalFilename;
         file.url = res.url;
         file.originalFileName = res.originalFilename;
         file.fileUrl = res.fileName;

src/views/business/production/fileUpload/detail2.vue

@@ -348,7 +348,7 @@
     uploadFile(formData).then((res) => {
       if (res.code === 200) {
         const file = {};
-        file.fileName = res.newFileName;
+        file.fileName = res.originalFilename;
         file.url = res.url;
         file.originalFileName = res.originalFilename;
         file.fileUrl = res.fileName;

src/views/business/production/financialReportTax/FormDialog.vue

@@ -628,7 +628,7 @@
       if (res.code === 200) {
         console.log(res);
         const file = {};
-        file.fileName = res.newFileName;
+        file.fileName = res.originalFilename;
         file.url = res.url;
         file.originalFileName = res.originalFilename;
         file.fileUrl = res.fileName;

src/views/business/production/financialReportTaxIsZero/FormDialog.vue

@@ -467,7 +467,7 @@
       if (res.code === 200) {
         console.log(res);
         const file = {};
-        file.fileName = res.newFileName;
+        file.fileName = res.originalFilename;
         file.url = res.url;
         file.originalFileName = res.originalFilename;
         file.fileUrl = res.fileName;

src/views/business/production/receiveResource/index.vue

@@ -310,7 +310,7 @@
     uploadFile(formData).then((res) => {
       if (res.code === 200) {
         const file = {};
-        file.fileName = res.newFileName;
+        file.fileName = res.originalFilename;
         file.url = res.url;
         file.originalFileName = res.originalFilename;
         file.fileUrl = res.fileName;

src/views/business/production/receiveTicketFeedback/index.vue

@@ -351,7 +351,7 @@ width="50"
     uploadFile(formData).then((res) => {
       if (res.code === 200) {
         const file = {};
-        file.fileName = res.newFileName;
+        file.fileName = res.originalFilename;
         file.url = res.url;
         file.originalFileName = res.originalFilename;
         file.fileUrl = res.fileName;

src/views/business/service/loop/housingFundForm.vue

@@ -491,7 +491,7 @@
     uploadFile(formData).then((res) => {
       if (res.code === 200) {
         const file = {};
-        file.fileName = res.newFileName;
+        file.fileName = res.originalFilename;
         file.url = res.url;
         file.originalFileName = res.originalFilename;
         file.fileUrl = res.fileName;
@@ -535,7 +535,7 @@
           proxy.$modal.msgError("文件类型错误,只能上传png,jpg格式");
           return;
         }
-        file.fileName = res.newFileName;
+        file.fileName = res.originalFilename;
         file.url = res.url;
         file.originalFileName = res.originalFilename;
         file.fileUrl = res.fileName;
@@ -597,7 +597,7 @@
           proxy.$modal.msgError("文件类型错误,只能上传png,jpg格式");
           return;
         }
-        file.fileName = res.newFileName;
+        file.fileName = res.originalFilename;
         file.url = res.url;
         file.originalFileName = res.originalFilename;
         file.fileUrl = res.fileName;

src/views/business/service/loop/housingFundView.vue

@@ -456,7 +456,7 @@ function upload(param) {
   uploadFile(formData).then((res) => {
     if (res.code === 200) {
       const file = {};
-      file.fileName = res.newFileName;
+      file.fileName = res.originalFilename;
       file.url = res.url;
       file.originalFileName = res.originalFilename;
       file.fileUrl = res.fileName;
@@ -494,7 +494,7 @@ function uploadIdImage(param, row, field) {
   uploadFile(formData).then((res) => {
     if (res.code === 200) {
       const file = {};
-      file.fileName = res.newFileName;
+      file.fileName = res.originalFilename;
       file.url = res.url;
       file.originalFileName = res.originalFilename;
       file.fileUrl = res.fileName;

src/views/business/service/loop/socialSecurityForm.vue

@@ -536,7 +536,7 @@
     uploadFile(formData).then((res) => {
       if (res.code === 200) {
         const file = {};
-        file.fileName = res.newFileName;
+        file.fileName = res.originalFilename;
         file.url = res.url;
         file.originalFileName = res.originalFilename;
         file.fileUrl = res.fileName;
@@ -580,7 +580,7 @@
           proxy.$modal.msgError("文件类型错误,只能上传png,jpg格式");
           return;
         }
-        file.fileName = res.newFileName;
+        file.fileName = res.originalFilename;
         file.url = res.url;
         file.originalFileName = res.originalFilename;
         file.fileUrl = res.fileName;
@@ -643,7 +643,7 @@
           proxy.$modal.msgError("文件类型错误,只能上传png,jpg格式");
           return;
         }
-        file.fileName = res.newFileName;
+        file.fileName = res.originalFilename;
         file.url = res.url;
         file.originalFileName = res.originalFilename;
         file.fileUrl = res.fileName;

src/views/business/service/loop/socialSecurityView.vue

@@ -499,7 +499,7 @@ function upload(param) {
   uploadFile(formData).then((res) => {
     if (res.code === 200) {
       const file = {};
-      file.fileName = res.newFileName;
+      file.fileName = res.originalFilename;
       file.url = res.url;
       file.originalFileName = res.originalFilename;
       file.fileUrl = res.fileName;
@@ -537,7 +537,7 @@ function uploadIdImage(param, row, field) {
   uploadFile(formData).then((res) => {
     if (res.code === 200) {
       const file = {};
-      file.fileName = res.newFileName;
+      file.fileName = res.originalFilename;
       file.url = res.url;
       file.originalFileName = res.originalFilename;
       file.fileUrl = res.fileName;

src/views/business/socialSecurity/confirm/form.vue

@@ -713,7 +713,7 @@
           proxy.$modal.msgError("文件类型错误,只能上传png,jpg格式");
           return;
         }
-        file.fileName = res.newFileName;
+        file.fileName = res.originalFilename;
         file.url = res.url;
         file.originalFileName = res.originalFilename;
         file.fileUrl = res.fileName;
@@ -767,7 +767,7 @@
           proxy.$modal.msgError("文件类型错误,只能上传png,jpg格式");
           return;
         }
-        file.fileName = res.newFileName;
+        file.fileName = res.originalFilename;
         file.url = res.url;
         file.originalFileName = res.originalFilename;
         file.fileUrl = res.fileName;

src/views/business/socialSecurity/declare/form.vue

@@ -779,7 +779,7 @@
     uploadFile(formData).then((res) => {
       if (res.code === 200) {
         const file = {};
-        file.fileName = res.newFileName;
+        file.fileName = res.originalFilename;
         file.url = res.url;
         file.fileType =
           res.newFileName.split(".")[res.newFileName.split(".").length - 1];
@@ -800,7 +800,7 @@
     uploadFile(formData).then((res) => {
       if (res.code === 200) {
         const file = {};
-        file.fileName = res.newFileName;
+        file.fileName = res.originalFilename;
         file.url = res.url;
         file.fileType =
           res.newFileName.split(".")[res.newFileName.split(".").length - 1];

src/views/business/socialSecurity/declare/view.vue

@@ -772,7 +772,7 @@
     uploadFile(formData).then((res) => {
       if (res.code === 200) {
         const file = {};
-        file.fileName = res.newFileName;
+        file.fileName = res.originalFilename;
         file.url = res.url;
         file.fileType =
           res.newFileName.split(".")[res.newFileName.split(".").length - 1];
@@ -788,7 +788,7 @@
     uploadFile(formData).then((res) => {
       if (res.code === 200) {
         const file = {};
-        file.fileName = res.newFileName;
+        file.fileName = res.originalFilename;
         file.url = res.url;
         file.originalFileName = res.originalFilename;
         file.fileUrl = res.fileName;

src/views/business/upgrade/order/form.vue

@@ -1662,7 +1662,7 @@
     uploadFile(formData).then((res) => {
       if (res.code === 200) {
         const file = {};
-        file.fileName = res.newFileName;
+        file.fileName = res.originalFilename;
         file.url = res.url;
         file.originalFileName = res.originalFilename;
         file.fileUrl = res.fileName;

src/views/login.vue

@@ -5,11 +5,19 @@
       <div>提供智能财务软件 代记账等 助力企业节省成本</div>
     </div>
     <div class="login-r">
-      <img
-        class="logo"
-        referrerpolicy="no-referrer"
-        src="@/assets/logo/logo.png"
-      />
+      <div style="display: flex; align-items: center;">
+        <!-- <div style="width: 46px; height: 46px;"> -->
+        <img style="width: 48px; height: 48 px;"
+          class="logo"
+          referrerpolicy="no-referrer"
+          src="@/assets/logo/icon.png"
+        />
+        <img
+          class="logo"
+          referrerpolicy="no-referrer"
+          src="@/assets/logo/logo.png"
+        />
+      </div>
       <span class="title">欢迎使用账羚羊财务平台</span>
       <el-form
         ref="loginRef"