ly 1 vuosi sitten
vanhempi
säilyke
43bf8229aa

+ 14 - 0
src/api/business/entrust/deduct.js

@@ -103,4 +103,18 @@ export function rejectDeduct(data) {
     data: data
   })
 
+}
+
+
+export function exportAccountStatement(query) {
+  request.defaults.baseURL = '/ezhizao-yzbh-entrust'
+  console.log(query);
+  download(
+    "/business/deduct/exportAccountStatement",
+    {
+      ...query,
+    },
+ 
+    `对账单导出_${query.title}.xlsx`
+  )
 }

+ 1 - 6
src/views/business/entrust/deduct/form.vue

@@ -296,12 +296,7 @@
                       width="200"
                       prop="companyName"
                     />
-                    <el-table-column
-                      label="税号"
-                      align="center"
-                      prop="socialCreditCode"
-                      width="150"
-                    />
+              
                     <el-table-column
                       label="所在区"
                       align="center"

+ 0 - 1
src/views/business/entrust/statementAccount/ChoiceMonthDialog.vue

@@ -71,7 +71,6 @@ function submitForm() {
 
 function disabledDateHandler(date) {
   const d = proxy.moment(date, 'YYYY-MM-DD').format('YYYY-MM-DD')
-  console.log(d)
   // debugger
   // 判断是否在months 中
   if (months.value.includes(d)) {

+ 7 - 3
src/views/business/entrust/statementAccount/form.vue

@@ -15,7 +15,7 @@
               icon="Edit" @click="editStatus = true">修改</el-button>
             <el-button v-if="form.id && editStatus" type="info" size="small" icon="Close"
               @click="editStatus = false">取消修改</el-button>
-            <el-button type="info" size="small" icon="Close" @click="exportExcel">导出</el-button>
+            <el-button type="warning" size="small" icon="Download" @click="exportExcel">导出</el-button>
             <el-button v-if="form.id" type="success" icon="refresh" size="small" @click="getForm">
               刷新</el-button>
 
@@ -273,6 +273,7 @@
     genDeduct,
     addDeduct,
     updateDeduct,
+    exportAccountStatement
   } from "@/api/business/entrust/deduct";
   import useUserStore from "@/store/modules/user";
   import { deepClone } from "@/utils";
@@ -379,10 +380,12 @@
     if (id) {
       loading.value = true;
       getDeduct(id).then((response) => {
-        console.log(response);
         form.value = response.data;
         editStatus.value = false;
         title.value = "修改客户";
+        condition.value.entrustOrderId = form.value.entrustOrderId;
+        condition.value.startMonth = form.value.startMonth;
+        condition.value.endMonth = form.value.endMonth;
       }).finally
       (() => {
         loading.value = false;
@@ -465,7 +468,8 @@
     }
   }
   function exportExcel() {
-    console.log(condition.value);
+    condition.value.title =  "(" + form.value.contactCompany + "-" + form.value.formNo+")";
+    exportAccountStatement(condition.value)
   }
   /** 提交保存 */
   function submitForm() {

+ 16 - 0
src/views/system/reconciliation/priceList/index.vue

@@ -87,6 +87,22 @@
         min-width="120"
         prop="taskTypeName"
       />
+      <el-table-column
+        label="是否零申报"
+        align="center"
+        min-width="120"
+        prop="isZero"
+      >
+      <template #default="scope">
+          <span v-if="scope.row.isZero == 1">{{
+            scope.row.isZero ? "是" : "否"
+          }}</span>
+          <span v-else-if="scope.row.isZero == 0">{{
+            scope.row.isZero ? "是" : "否"
+          }}</span>
+          <span v-else>--</span>
+        </template>
+      </el-table-column>
       <el-table-column
         label="单价"
         header-align="center"