付款模块修改

src/libs/axios.js

@@ -2,7 +2,18 @@ import axios from 'axios'
 import store from '@/store'
 import router from '@/router'
 import { Message, Spin } from 'iview'
-
+axios.interceptors.request.use(
+  function (config) {
+      if(config.data && config.data.endTime){
+        console.log(config.data.endTime)
+        config.data.endTime = config.data.endTime.substr(0,10) + ' ' + '23:59:59'
+      }
+      return config;
+  },
+  function (error) {
+      return Promise.reject(error);
+  }
+)
 class HttpRequest {
   constructor (baseUrl = baseURL) {
     this.baseUrl = baseUrl
@@ -26,6 +37,7 @@ class HttpRequest {
   interceptors (instance, url) {
     // 请求拦截
     instance.interceptors.request.use(config => {
+      console.log(config.data)
       // 添加全局的loading...
       if (!Object.keys(this.queue).length && !config.data.isHiddenSpin) {
         Spin.show({

src/view/base-manage/provider-maintenance/provider-maintenance2.vue

@@ -15,19 +15,29 @@
         </Poptip>
         
       </FormItem>
-      <FormItem label="按产品查看">
-        <Select v-model="params.Purpose" style="width:150px" @on-change="selectPurposeFn" filterable>
-            <div slot="empty">无匹配数据</div>
-            <Option  :value="999">全部</Option>
-            <Option v-for="(i,index) in selectPurposeList" :value="index" :key="index">{{ i.purpose }}</Option>
-        </Select>
-      </FormItem>
+      <Form-item label="按产品查看">
+					<Select
+						v-model="params.PurposeIndex"
+						style="width: 150px"
+						@on-change="selectPurposeFn"
+						filterable
+					>
+						<div slot="empty">无匹配数据</div>
+						<Option :value="999">全部</Option>
+						<Option
+							v-for="(i, index) in selectPurposeList"
+							:value="index"
+							:key="index"
+							>{{ i.purpose }}</Option
+						>
+					</Select>
+				</Form-item>
       <FormItem label="按账期查看">
         <Select v-model="params.accountDate" style="width:150px" >
             <div slot="empty">无匹配数据</div>
             <Option  value="">全部</Option>
             <Option v-for="(i,index) in accountDateList" :value="i.accountDate" :key="index">
-              {{ i.accountDate + '天（' }}<span style="color:red">{{i.count}}</span>)
+              {{ i.accountDate + '天（' }}{{i.count}})
             </Option>
         </Select>
       </FormItem>
@@ -36,7 +46,7 @@
             <div slot="empty">无匹配数据</div>
             <Option  value="">全部</Option>
             <Option v-for="(i,index) in safetyWarnDayList" :value="i.type" :key="index">
-              {{ i.name + '（' }}<span style="color:red">{{i.count}}</span>)
+              {{ i.name + '（' }}{{i.count}})
             </Option>
         </Select>
       </FormItem>
@@ -1119,8 +1129,6 @@ export default {
         TechnologyType:99,
         Purpose:null,
         search:null,
-        type:'',
-        accountDate:'',
       },
       total:0,
       loading:false,
@@ -1146,7 +1154,7 @@ export default {
       })
       
     },
-
+  
     selectPurposeFn(e){
       console.log(e)
       if(e == 999){
@@ -1267,6 +1275,12 @@ export default {
       axios
         .get('/cloudApi/material/selectPurposeList?purpose=' + '', {})
         .then((res) => {
+          for (let i = 0; i < res.data.data.length; i++) {
+            const element = res.data.data[i];
+            if(element == ''){
+              res.data.data.splice(i,1)
+            }
+          }
           v.selectPurposeList = res.data.data
           v.loading = false
         })
@@ -1283,44 +1297,24 @@ export default {
           console.log(v.supplierList)
         })
     },
-    
     getStatisticsClassify(){
-      
-      function filter(str) { // 特殊字符转义
-        str += ''; // 隐式转换
-        str = str.replace(/%/g, '%25');
-        str = str.replace(/\+/g, '%2B');
-        str = str.replace(/ /g, '%20');
-        str = str.replace(/\//g, '%2F');
-        str = str.replace(/\?/g, '%3F');
-        str = str.replace(/&/g, '%26');
-        str = str.replace(/\=/g, '%3D');
-        str = str.replace(/#/g, '%23');
-        return str;
-      }
-      
-      function formateObjToParamStr(paramObj) {
-        const sdata = [];
-        for (let attr in paramObj) {
-          sdata.push(`${attr}=${filter(paramObj[attr])}`);
-        }
-        return sdata.join('&');
-      };
       axios
-				.get('/cloudApi/supplier/statisticsClassify?' + formateObjToParamStr(this.params))
+				.post(
+					'/cloudApi/supplier/statisticsClassify',this.params)
 				.then((res) => {
-          res.data.data.unshift({
-            technologyType:99,
-            categoryCount:0
-          })
-          axios
-          .post('/cloudApi/supplier/list/count', {...this.params})
-          .then((res) => {
-            this.total = res.data.data
-          })
+					res.data.data.unshift({
+						technologyType: 99,
+						categoryCount: 0,
+					})
+					axios
+						.post('/cloudApi/supplier/list/count', {
+							...this.params,
+						})
+						.then((res) => {
+							this.total = res.data.data
+						})
 					this.statisticsClassifyData = res.data.data
 				})
-      
     },
 
     

src/view/base-manage/provider-maintenance/purchaseList.vue

@@ -31,8 +31,7 @@
 							:key="index"
 						>
 							{{ i.accountDate + '天（'
-							}}<span style="color: red">{{ i.count }}</span
-							>)
+							}}{{ i.count }})
 						</Option>
 					</Select>
 				</FormItem>
@@ -45,9 +44,7 @@
 							:value="i.type"
 							:key="index"
 						>
-							{{ i.name + '（'
-							}}<span style="color: red">{{ i.count }}</span
-							>)
+							{{ i.name + '（'}}{{ i.count }})
 						</Option>
 					</Select>
 				</FormItem>
@@ -705,32 +702,10 @@ export default {
 			}
 		},
 		getStatisticsClassify() {
-			function filter(str) {
-				// 特殊字符转义
-				str += '' // 隐式转换
-				str = str.replace(/%/g, '%25')
-				str = str.replace(/\+/g, '%2B')
-				str = str.replace(/ /g, '%20')
-				str = str.replace(/\//g, '%2F')
-				str = str.replace(/\?/g, '%3F')
-				str = str.replace(/&/g, '%26')
-				str = str.replace(/\=/g, '%3D')
-				str = str.replace(/#/g, '%23')
-				return str
-			}
-
-			function formateObjToParamStr(paramObj) {
-				const sdata = []
-				for (let attr in paramObj) {
-					sdata.push(`${attr}=${filter(paramObj[attr])}`)
-				}
-				return sdata.join('&')
-			}
+			
 			axios
-				.get(
-					'/cloudApi/supplier/statisticsClassify?' +
-						formateObjToParamStr(this.params)
-				)
+				.post(
+					'/cloudApi/supplier/statisticsClassify',this.params)
 				.then((res) => {
 					res.data.data.unshift({
 						technologyType: 99,

src/view/index/schedule/schedule.vue

@@ -1,48 +1,17 @@
 <!-- 待办事项 -->
 <template>
   <div class="container">
-    <div class="tab-nav">
-      <date-select v-model="params" :selectMonthStatus="false" @change="selectTime"></date-select>
-      <div style="margin-left: 16px">
-        <RadioGroup v-model="params.checkState" @on-change="changeState">
-          <Radio
-            v-for="(radio, index) in stateList"
-            :key="index"
-            :label="radio.value"
-          >
-            {{ radio.label }}
-          </Radio>
-        </RadioGroup>
-      </div>
-      <div style="margin-left: 16px">
-        <Select v-model="params.id" clearable style="width:200px" @on-change="changeFlow">
-          <Option v-for="item in flowList" :value="item.id" :key="item.id" :label="item.flowName">
-            <span>{{ item.flowName }} (</span>
-            <span style="color: red">{{ item.count }}</span>
-            <span>)</span>
-          </Option>
-        </Select>
-      </div>
-      <div style="margin-left: 16px">
-        <Input v-model="params.keyword" clearable placeholder="请输入关键字" style="width: 200px" />
-      </div>
-      <Button type="primary" style="margin-left: 16px" @click="clickSearch">查询</Button>
-      <Button type="primary" style="margin-left: 16px" @click="clickExportExcel">导出Excel</Button>
-      <Button type="primary" style="margin-left: 32px" @click="dispatchShow = true">批量审核</Button>
-    </div>
-    <div class="main">
-      <my-table
-        :data="data"
-        :columns="columns"
-        :table-page="params"
-        selectKey="linkId"
-        @on-select="getSelect"
-        @on-change="changePage"
-      >
-        <!-- :table-filter="tableFilter"
-        @event-handle="eventHandle" -->
-      </my-table>
-    </div>
+    <my-table
+      :data="data"
+      :columns="columns"
+      :table-filter="tableFilter"
+      :table-page="params"
+      selectKey="linkId"
+      @event-handle="eventHandle"
+      @on-select="getSelect"
+      @on-change="changePage"
+    >
+    </my-table>
     <purchase-form
       v-model="purchaseShow"
       :data="formData"
@@ -196,9 +165,6 @@ import ProviderTagDelForm from './provider-tag-del-form'
 import ProviderShipmentForm from './provider-shipment-form'
 import profitTagForm from './profit-tag-form'
 import { exportExcel } from '@/libs/util'
-import dateSelect from '@/components/dateSelect/dateSelect'
-import axios from 'axios'
-
 export default {
   name: 'schedule',
   components: {
@@ -220,8 +186,7 @@ export default {
     ProviderContractOverForm,
     ProviderTagDelForm,
     ProviderShipmentForm,
-    profitTagForm,
-    dateSelect
+    profitTagForm
   },
   data () {
     return {
@@ -276,153 +241,146 @@ export default {
               {
                 on: {
                   click (e) {
-                    axios
-                      .post('/cloudApi/applet/getApproveType', {
-                        ...params.row
+                    e.stopPropagation()
+                    _this.formData = {}
+                    if (params.row.dealWithType === 0) {
+                      // 请购单审批
+                      GetApplyPurchasePageList({
+                        id: params.row.linkId,
+                        pageIndex: 1,
+                        pageSize: 1
+                      }).then(res => {
+                        if (res.code === 0) {
+                          _this.formData = {
+                            ...res.result.list[0],
+                            ...params.row
+                          }
+                          _this.purchaseShow = true
+                        }
+                      })
+                    } else if (params.row.dealWithType === 1) {
+                      // 合同审批
+                      GetPurContractPageList({
+                        id: params.row.linkId,
+                        pageIndex: 1,
+                        pageSize: 1
+                      }).then(res => {
+                        if (res.code === 0) {
+                          _this.formData = {
+                            ...res.result.list[0],
+                            ...params.row
+                          }
+                          _this.contractShow = true
+                        }
+                      })
+                    } else if (params.row.dealWithType === 2) {
+                      // 付款审批
+                      _this.formData = { ...params.row }
+                      _this.payShow = true
+                    } else if (params.row.dealWithType === 3) {
+                      // 领料申请
+                      GetApplyTakePageList({
+                        id: params.row.linkId,
+                        pageIndex: 1,
+                        pageSize: 1
+                      }).then(res => {
+                        if (res.code === 0) {
+                          _this.formData = {
+                            ...res.result.list[0],
+                            ...params.row
+                          }
+                          _this.applyMaterialShow = true
+                        }
+                      })
+                    } else if (params.row.dealWithType === 4) {
+                      // 其他出库退货/报损
+                      GetApplyStockOutBill({
+                        id: params.row.linkId
+                      }).then(res => {
+                        if (res.code === 0) {
+                          _this.formData = { ...res.result, ...params.row }
+                          _this.otherShow = true
+                        }
                       })
-                      .then(res => {
-                        params.row.approveType = res.data.data
-                        e.stopPropagation()
-                        _this.formData = {}
-                        if (params.row.dealWithType === 0) {
-                          // 请购单审批
-                          GetApplyPurchasePageList({
-                            id: params.row.linkId,
-                            pageNum: 1,
-                            pageSize: 1
-                          }).then(res => {
-                            if (res.code === 0) {
-                              _this.formData = {
-                                ...res.result.list[0],
-                                ...params.row
-                              }
-                              _this.purchaseShow = true
-                            }
-                          })
-                        } else if (params.row.dealWithType === 1) {
-                          // 合同审批
-                          GetPurContractPageList({
-                            id: params.row.linkId,
-                            pageNum: 1,
-                            pageSize: 1
-                          }).then(res => {
-                            if (res.code === 0) {
-                              _this.formData = {
-                                ...res.result.list[0],
-                                ...params.row
-                              }
-                              _this.contractShow = true
-                            }
-                          })
-                        } else if (params.row.dealWithType === 2) {
-                          // 付款审批
-                          _this.formData = { ...params.row }
-                          _this.payShow = true
-                        } else if (params.row.dealWithType === 3) {
-                          // 领料申请
-                          GetApplyTakePageList({
-                            id: params.row.linkId,
-                            pageNum: 1,
-                            pageSize: 1
-                          }).then(res => {
-                            if (res.code === 0) {
-                              _this.formData = {
-                                ...res.result.list[0],
-                                ...params.row
-                              }
-                              _this.applyMaterialShow = true
-                            }
-                          })
-                        } else if (params.row.dealWithType === 4) {
-                          // 其他出库退货/报损
-                          GetApplyStockOutBill({
-                            id: params.row.linkId
-                          }).then(res => {
-                            if (res.code === 0) {
-                              _this.formData = { ...res.result, ...params.row }
-                              _this.otherShow = true
-                            }
-                          })
-                        } else if (params.row.dealWithType === 5) {
-                          // 到货质检数量修正
-                          GetQuantityCheckLake({
-                            checkAdjustId: params.row.linkId
-                          }).then(res => {
-                            if (res.code === 0) {
-                              _this.formData = { ...res.result, ...params.row }
-                              _this.qtyCheckShow = true
-                            }
-                          })
-                        } else if (params.row.dealWithType === 6) {
-                          // 物料审批
-                          _this.formData = { ...params.row }
-                          _this.materialApproveShow = true
-                        } else if (params.row.dealWithType === 7) {
-                          // 供应商调价
-                          GetChangePriceCheck({
-                            priceChangeId: params.row.linkId
-                          }).then(res => {
-                            if (res.code === 0) {
-                              _this.formData = { ...res.result, ...params.row }
-                              _this.providerPriceShow = true
-                            }
-                          })
-                        } else if (params.row.dealWithType === 8) {
-                          // 审核盘点
-                          _this.formData = { ...params.row }
-                          _this.profitShow = true
-                        } else if (params.row.dealWithType === 9) {
-                          // 归还入库
-                          GetApplyStockInBackRequestDto({
-                            id: params.row.linkId
-                          }).then(res => {
-                            if (res.code === 0) {
-                              _this.formData = { ...res.result, ...params.row }
-                              _this.returnShow = true
-                            }
-                          })
-                        } else if (params.row.dealWithType === 10) {
-                          // 合同删除
-                          GetPurchaseContractDel({
-                            id: params.row.linkId
-                          }).then(res => {
-                            if (res.code === 0) {
-                              _this.formData = { ...res.result, ...params.row }
-                              _this.delContractShow = true
-                            }
-                          })
-                        } else if (params.row.dealWithType === 11) {
-                          // 免检申请
-                          GetStockExemptCheck({
-                            exemptCheckId: params.row.linkId
-                          }).then(res => {
-                            if (res.code === 0) {
-                              _this.formData = { ...res.result, ...params.row }
-                              _this.noCheckShow = true
-                            }
-                          })
-                        } else if (params.row.dealWithType === 12) {
-                          // 供应商审批
-                          GetSupplierShipFlow({
-                            flowCheckId: params.row.flowChekId
-                          }).then(res => {
-                            if (res.code === 0) {
-                              _this.formData = { ...res.result, ...params.row }
-                              if (res.result.supplierApplyType === 0) {
-                                _this.providerShipmentShow = true
-                              } else if (res.result.supplierApplyType === 1) {
-                                _this.providerContractOverShow = true
-                              } else if (res.result.supplierApplyType === 2) {
-                                _this.providerTagDelShow = true
-                              }
-                            }
-                          })
-                        } else if (params.row.dealWithType === 13) {
-                          // 盘点标签处置
-                          _this.formData = { ...params.row }
-                          _this.profitTagFormShow = true
+                    } else if (params.row.dealWithType === 5) {
+                      // 到货质检数量修正
+                      GetQuantityCheckLake({
+                        checkAdjustId: params.row.linkId
+                      }).then(res => {
+                        if (res.code === 0) {
+                          _this.formData = { ...res.result, ...params.row }
+                          _this.qtyCheckShow = true
                         }
                       })
+                    } else if (params.row.dealWithType === 6) {
+                      // 物料审批
+                      _this.formData = { ...params.row }
+                      _this.materialApproveShow = true
+                    } else if (params.row.dealWithType === 7) {
+                      // 供应商调价
+                      GetChangePriceCheck({
+                        priceChangeId: params.row.linkId
+                      }).then(res => {
+                        if (res.code === 0) {
+                          _this.formData = { ...res.result, ...params.row }
+                          _this.providerPriceShow = true
+                        }
+                      })
+                    } else if (params.row.dealWithType === 8) {
+                      // 审核盘点
+                      _this.formData = { ...params.row }
+                      _this.profitShow = true
+                    } else if (params.row.dealWithType === 9) {
+                      // 归还入库
+                      GetApplyStockInBackRequestDto({
+                        id: params.row.linkId
+                      }).then(res => {
+                        if (res.code === 0) {
+                          _this.formData = { ...res.result, ...params.row }
+                          _this.returnShow = true
+                        }
+                      })
+                    } else if (params.row.dealWithType === 10) {
+                      // 合同删除
+                      GetPurchaseContractDel({
+                        id: params.row.linkId
+                      }).then(res => {
+                        if (res.code === 0) {
+                          _this.formData = { ...res.result, ...params.row }
+                          _this.delContractShow = true
+                        }
+                      })
+                    } else if (params.row.dealWithType === 11) {
+                      // 免检申请
+                      GetStockExemptCheck({
+                        exemptCheckId: params.row.linkId
+                      }).then(res => {
+                        if (res.code === 0) {
+                          _this.formData = { ...res.result, ...params.row }
+                          _this.noCheckShow = true
+                        }
+                      })
+                    } else if (params.row.dealWithType === 12) {
+                      // 供应商审批
+                      GetSupplierShipFlow({
+                        flowCheckId: params.row.flowChekId
+                      }).then(res => {
+                        if (res.code === 0) {
+                          _this.formData = { ...res.result, ...params.row }
+                          if (res.result.supplierApplyType === 0) {
+                            _this.providerShipmentShow = true
+                          } else if (res.result.supplierApplyType === 1) {
+                            _this.providerContractOverShow = true
+                          } else if (res.result.supplierApplyType === 2) {
+                            _this.providerTagDelShow = true
+                          }
+                        }
+                      })
+                    } else if (params.row.dealWithType === 13) {
+                      // 盘点标签处置
+                      _this.formData = { ...params.row }
+                      _this.profitTagFormShow = true
+                    }
                   }
                 }
               },
@@ -499,27 +457,13 @@ export default {
         }
       ],
       params: {
-        pageNum: 1,
+        pageIndex: 1,
         pageSize: 20,
-        beginTime: '',
-        endTime: '',
-        checkState: 1,
-        total: 0,
-        keyword: ''
-      },
-      stateList:  [
-        { label: '待审批', value: 1 },
-        { label: '已审批', value: 2 },
-        { label: '已驳回', value: 3 },
-        { label: '已发起', value: 0 }
-      ],
-      flowList: []
+        total: 0
+      }
     }
   },
   methods: {
-    selectTime() {
-      this.getList()
-    },
     pass (type) {
       ApprovalBillFlow({
         linkCheckId: this.selectList,
@@ -538,6 +482,7 @@ export default {
     },
     getSelect (selection, data) {
       this.selectList = selection.map(item => item.flowChekId)
+      console.log(this.selectList)
     },
     cfm (type, formData) {
       if (type === 'add') {
@@ -566,7 +511,7 @@ export default {
     eventHandle (option) {
       switch (option._evnet) {
         case 'search':
-          this.params.pageNum = 1
+          this.params.pageIndex = 1
           this.params.keyWord = option.key
           this.params.approvalFlowState = option.approvalFlowState
           this.params.dealWithType = option.dealWithType
@@ -575,7 +520,7 @@ export default {
         case 'export':
           GetDealWithItem({
             ...this.params,
-            pageNum: 1,
+            pageIndex: 1,
             pageSize: 99999
           }).then(res => {
             if (res.code === 0) {
@@ -590,61 +535,18 @@ export default {
           break
       }
     },
-    changePage (pageNum) {
-      this.params.pageNum = pageNum
+    changePage (pageIndex) {
+      this.params.pageIndex = pageIndex
       this.getList()
     },
     getList () {
-      axios
-        .post('/cloudApi/applet/flowPage', {
-          ...this.params
-        })
-        .then(res => {
-          this.data = res.data.data.records
-          this.params.total = res.data.data.total
-        })
-      // GetDealWithItem(this.params).then(res => {
-      //   if (res.code === 0) {
-      //   }
-      // })
-    },
-    getFlowList() {
-      axios
-        .post('/cloudApi/applet/flowNum', {
-          beginTime: this.params.beginTime,
-          endTime: this.params.endTime,
-          checkState: this.params.checkState
-        })
-        .then(res => {
-          this.flowList = res.data.data
-        })
-    },
-    changeState() {
-      this.params.id = ''
-      this.getFlowList()
-      this.getList()
-    },
-    changeFlow() {
-      this.getList()
-    },
-    clickSearch() {
-      this.params.pageNum = 1
-      this.getList()
-    },
-    clickExportExcel() {
-      axios
-        .post('/cloudApi/applet/flowPage', {
-          ...this.params
-        })
-        .then(res => {
-          let data = res.data.data.records
-          if (data.length < 1) return this.$Message.error('数据为空！')
-          exportExcel(this.columns, data, '待办事项')
-        })
-    },
-  },
-  created () {
-    this.getFlowList()
+      GetDealWithItem(this.params).then(res => {
+        if (res.code === 0) {
+          this.data = res.result.list
+          this.params.total = res.result.totalCount
+        }
+      })
+    }
   },
   mounted () {
     this.getList()
@@ -655,17 +557,6 @@ export default {
 <style lang="less" scoped>
 .container {
   height: 100%;
-  display: flex;
-  flex-direction: column;
-  .tab-nav {
-    display: flex;
-    align-items: center;
-    height: 32px;
-  }
-  .main {
-    flex: 1;
-    overflow: hidden;
-  }
 }
 /deep/ .ivu-modal-body {
   background: transparent;

src/view/material-manege/pay/modals/apply-form.vue

@@ -88,7 +88,7 @@
         <div class="col" style="flex: none">
           <div class="">实际支付金额：</div>
           <div class="value">
-            <div style="width: 95px;color: red;">{{ data.actAmount || 0 }}元</div>
+            <div style="width: 95px;color: red;">{{ (data.adjustAmount - data.hisPayAmount).toFixed(2) - data.backAmount - data.expressAmount - data.totalBalance || 0}}元</div>
           </div>
           <span style="padding: 0 10px">&nbsp;&nbsp;&nbsp;&nbsp;</span>
         </div>
@@ -111,7 +111,7 @@
 
 <script>
 import { SavePayContractBill } from '@/api/applyPurchase'
-
+import axios from 'axios'
 export default {
   name: 'pass_modal',
   data () {
@@ -149,6 +149,10 @@ export default {
     },
     value: {
       handler (n) {
+        console.log(n)
+        if(n){
+          this.getpaymentGetBackAmount(this.data.purchaseBillNo)
+        }
         this.modal = n
       },
       immediate: true
@@ -157,7 +161,19 @@ export default {
       this.$emit('input', n)
     }
   },
+  created(){
+    
+  },
   methods: {
+    getpaymentGetBackAmount(_id){
+      const v = this
+      
+      axios.post('/cloudApi/supplier/paymentGetBackAmount',{purchaseBillNo:_id}).then(res=>{
+        console.log(res)
+        this.data.totalBalance = 0
+        this.data.backAmount = res.data.data
+      })
+    },
     accoutClear () {
       this.$set(this.data, 'bankAccout', '')
       this.$set(this.data, 'openBank', '')
@@ -177,14 +193,14 @@ export default {
         backAmount: this.data.backAmount,
         balanceAmount: this.data.totalBalance,
         expressAmount: this.data.expressAmount,
-        actAmount: this.data.actAmount,
+        actAmount: (this.data.adjustAmount - this.data.hisPayAmount).toFixed(2) - this.data.backAmount - this.data.expressAmount - this.data.totalBalance,
         bankAccout: this.data.bankAccout,
         bankAccoutName: this.data.bankAccoutName,
         openBank: this.data.openBank,
         applyPayType: this.data.canApplyPay === 0 ? 1 : this.data.canApplyPay === 1 ? 0 : '',
         payAccount: this.data.payAccount
       }
-      console.log(obj)
+      
       SavePayContractBill({
         ...obj
       }).then(res => {

src/view/store-manage/store-manage/store-manage-2.vue

@@ -132,7 +132,7 @@
 				<Checkbox
 					v-model="params.inventoryResults"
 					true-value="0"
-					false-value="1"
+					false-value=""
 					@on-change="errChange"
 					>筛选异常</Checkbox
 				>
@@ -193,6 +193,11 @@
 					>导出Excel</Button
 				>
 			</div>
+			<div class="filter-item">
+				<Button type="primary" style="width: 90px" @click="exportExcel2"
+					>导出详情</Button
+				>
+			</div>
 		</div>
 		<div class="line" style="margin-bottom: 10px"></div>
 		<!--用途（原来代码）-->
@@ -847,6 +852,30 @@ export default {
 				})
 			}
 		},
+		exportExcel2(){
+			const v = this
+			let columns = [
+				{ title: '物料编码', key: 'materialCode' },
+				{ title: '物料名称', key: 'materialName' },
+				{ title: 'RFID', key: 'rfidCode' },
+				{ title: '物料数量', key: 'quantity' },
+				{ title: '入库时间', key: 'createTime' },
+				{ title: '在库时间', key: 'inStockTime' },
+				{ title: '所在仓库', key: 'houseName' },
+				{ title: '库位', key: 'areaName' },
+				{ title: '质检状态', key: 'quantityCheckState' },
+			]
+			axios
+				.post('/cloudApi/stockWater/remainingTodayList', v.params)
+				.then((res) => {
+					for (let i = 0; i < res.data.data.length; i++) {
+						const element = res.data.data[i];
+						element.quantityCheckState = element.quantityCheckState === 0 ? '未质检' : element.quantityCheckState === 1 ? '已质检' : '无需质检'
+					}
+					let data = res.data.data
+					exportExcel(columns, data, '库存详情')
+				})
+		},
 		exportExcel() {
 			if (this.data.length < 1) return this.$Message.error('数据为空！')
 			let columns = [