财务审核新增需求

src/api/qw/qwUser.js

@@ -8,7 +8,25 @@ export function getQwUserAll() {
   })
 }
 
-// 根据条件查询企微用户列表
+// 选择企微账号（任务分配账号用）
+export function queryQwList(params) {
+  return request({
+    url: '/qw/user/queryQwList',
+    method: 'get',
+    params: params
+  })
+}
+
+// 查全部
+export function getUserList(params) {
+  return request({
+    url: '/qw/user/userList',
+    method: 'get',
+    params: params
+  })
+}
+
+// 根据条件查询企微用户列表 / 分页查询企微员工列表
 export function getQwList(params) {
   return request({
     url: '/qw/user/qwList',
@@ -16,3 +34,11 @@ export function getQwList(params) {
     params: params
   })
 }
+
+export function qwList(params) {
+  return request({
+    url: '/qw/user/qwList',
+    method: 'get',
+    params: params
+  })
+}

src/views/company/companyWorkflow/design.vue

@@ -282,7 +282,7 @@
               </el-form-item>
             </div>
              <!-- AI加微配置 -->
-            <div v-if="selectedNode.nodeType == 'AI_ADD_WX_TASK'" class="property-section">
+            <div v-if="selectedNode.nodeType == 'AI_ADD_WX_TASK_NEW'" class="property-section">
               <div class="section-title">
                 <i class="el-icon-chat-dot-round"></i>加微配置
               </div>

src/views/store/externalOrder/index.vue

@@ -246,8 +246,7 @@
       <el-table-column label="区县" align="center" prop="district" width="90" column-key="district" :filters="getFilters('district')" :filtered-value="columnFilters.district" />
       <el-table-column label="乡镇" align="center" prop="township" width="90" column-key="township" :filters="getFilters('township')" :filtered-value="columnFilters.township" />
       <el-table-column label="病名" align="center" prop="diseaseName" width="100" show-overflow-tooltip column-key="diseaseName" :filters="getFilters('diseaseName')" :filtered-value="columnFilters.diseaseName" />
-      <el-table-column label="商品名称" align="center" prop="productNames" width="200" show-overflow-tooltip column-key="productNames" :filters="getFilters('productNames')" :filtered-value="columnFilters.productNames" />
-      <el-table-column label="商品数量" align="center" prop="productNum" width="100" />
+      <el-table-column label="商品名称*数量" align="center" prop="productInfo" width="220" show-overflow-tooltip column-key="productNames" :filters="getFilters('productNames')" :filtered-value="columnFilters.productNames" />
       <el-table-column label="商品总额" align="center" prop="totalPrice" width="100" column-key="totalPrice" :filters="getFilters('totalPrice', null, true)" :filtered-value="columnFilters.totalPrice" />
       <el-table-column label="应收金额" align="center" prop="receivablePrice" width="100" column-key="receivablePrice" :filters="getFilters('receivablePrice', null, true)" :filtered-value="columnFilters.receivablePrice" />
       <el-table-column label="定金(实收)" align="center" prop="payPrice" width="100" column-key="payPrice" :filters="getFilters('payPrice', null, true)" :filtered-value="columnFilters.payPrice" />
@@ -1481,14 +1480,19 @@ export default {
       return type === 4 || (type >= 401 && type <= 423);
     },
     handleExport() {
-      const queryParams = this.queryParams;
       this.$confirm("是否确认导出外部订单数据项?", "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
       }).then(() => {
         this.exportLoading = true;
-        return exportExternalOrder(queryParams);
+        const params = { ...this.queryParams };
+        delete params.pageNum;
+        delete params.pageSize;
+        // el-input-number 清空后默认值为0，需转为null避免作为筛选条件传给后端（与getList一致）
+        const numFields = ['memberAge', 'memberBuyCountMin', 'payPrice', 'totalPrice', 'collectionPrice', 'refundPrice'];
+        numFields.forEach(f => { if (params[f] === 0) params[f] = null; });
+        return exportExternalOrder(params);
       }).then(response => {
         this.download(response.msg);
         this.exportLoading = false;

src/views/store/rejectNoReturn/index.vue

@@ -300,10 +300,14 @@ export default {
         type: 'warning'
       }).then(() => {
         this.exportLoading = true
+        const params = { ...this.queryParams }
+        delete params.pageNum
+        delete params.pageSize
+        if (params.totalPrice === 0) params.totalPrice = null
         let api = exportRejectNoReturn
         if (this.orderType === 'store') api = exportStoreRejectNoReturn
         else if (this.orderType === 'guCoin') api = exportGuCoinRejectNoReturn
-        return api(this.queryParams)
+        return api(params)
       }).then(response => {
         this.download(response.msg)
         this.exportLoading = false

src/views/store/rejectReport/index.vue

@@ -460,10 +460,14 @@ export default {
         type: 'warning'
       }).then(() => {
         this.orderExportLoading = true
+        const params = { ...this.orderQuery }
+        delete params.pageNum
+        delete params.pageSize
+        if (params.totalPrice === 0) params.totalPrice = null
         let api = exportRejectOrderReport
         if (this.orderType === 'store') api = exportStoreRejectOrderReport
         else if (this.orderType === 'guCoin') api = exportGuCoinRejectOrderReport
-        return api(this.orderQuery)
+        return api(params)
       }).then(response => {
         this.download(response.msg)
         this.orderExportLoading = false
@@ -507,10 +511,15 @@ export default {
         type: 'warning'
       }).then(() => {
         this.productExportLoading = true
+        const params = { ...this.productQuery }
+        delete params.pageNum
+        delete params.pageSize
+        if (params.totalNum === 0) params.totalNum = null
+        if (params.totalPrice === 0) params.totalPrice = null
         let api = exportRejectProductReport
         if (this.orderType === 'store') api = exportStoreRejectProductReport
         else if (this.orderType === 'guCoin') api = exportGuCoinRejectProductReport
-        return api(this.productQuery)
+        return api(params)
       }).then(response => {
         this.download(response.msg)
         this.productExportLoading = false

src/views/store/returnReport/index.vue

@@ -489,8 +489,13 @@ export default {
         type: 'warning'
       }).then(() => {
         this.orderExportLoading = true
+        const params = { ...this.orderQuery }
+        delete params.pageNum
+        delete params.pageSize
+        if (params.payPrice === 0) params.payPrice = null
+        if (params.totalPrice === 0) params.totalPrice = null
         const api = this.orderType === 'store' ? exportStoreReturnOrderReport : exportReturnOrderReport
-        return api(this.orderQuery)
+        return api(params)
       }).then(response => {
         this.download(response.msg)
         this.orderExportLoading = false
@@ -543,8 +548,11 @@ export default {
         type: 'warning'
       }).then(() => {
         this.productExportLoading = true
+        const params = { ...this.productQuery }
+        delete params.pageNum
+        delete params.pageSize
         const api = this.orderType === 'store' ? exportStoreReturnProductReport : exportReturnProductReport
-        return api(this.productQuery)
+        return api(params)
       }).then(response => {
         this.download(response.msg)
         this.productExportLoading = false

src/views/store/signDetailReport/index.vue

@@ -269,10 +269,17 @@ export default {
         type: 'warning'
       }).then(() => {
         this.exportLoading = true
+        const params = { ...this.queryParams }
+        delete params.pageNum
+        delete params.pageSize
+        if (params.deliveryCount === 0) params.deliveryCount = null
+        if (params.deliveryAmount === 0) params.deliveryAmount = null
+        if (params.signCount === 0) params.signCount = null
+        if (params.signAmount === 0) params.signAmount = null
         let api = exportSignDetailReport
         if (this.orderType === 'store') api = exportStoreSignDetailReport
         else if (this.orderType === 'guCoin') api = exportGuCoinSignDetailReport
-        return api(this.queryParams)
+        return api(params)
       }).then(response => {
         this.download(response.msg)
         this.exportLoading = false

src/views/store/signReport/index.vue

@@ -325,8 +325,14 @@ export default {
         type: 'warning'
       }).then(() => {
         this.exportLoading = true
+        const params = { ...this.queryParams }
+        delete params.pageNum
+        delete params.pageSize
+        if (params.payPrice === 0) params.payPrice = null
+        if (params.collectionPrice === 0) params.collectionPrice = null
+        if (params.totalPrice === 0) params.totalPrice = null
         const api = this.orderType === 'store' ? exportStoreSignOrderReport : exportSignOrderReport
-        return api(this.queryParams)
+        return api(params)
       }).then(response => {
         this.download(response.msg)
         this.exportLoading = false