lilei 2 tygodni temu
rodzic
commit
4689d78d96

+ 4 - 4
src/views/financialManagement/accountStatement/edit.vue

@@ -53,7 +53,7 @@
                   <a-form-item label="借贷类型">
                     <v-select
                       v-model="productForm.changeType"
-                      ref="changeType"
+                      ref="changeType1"
                       id="accountStatement-changeType1"
                       code="VERIFY_ACCOUNT_CHANGE_TYPE"
                       placeholder="请选择借贷类型"
@@ -66,14 +66,14 @@
                       v-model="productForm.bizType"
                       ref="bizType1"
                       id="accountStatement-bizType1"
-                      code="FINANCE_BOOK_STATE"
+                      code="VERIFY_ACCOUNT_BIZ_TYPE"
                       placeholder="请选择业务类型"
                       allowClear></v-select>
                   </a-form-item>
                 </a-col>
                 <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
-                  <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-                  <a-button style="margin-left: 5px" @click="resetSearchForm">重置</a-button>
+                  <a-button id="accountStatement-2-search" type="primary" @click="$refs.table.refresh(true)">查询</a-button>
+                  <a-button id="accountStatement-2-restForm" style="margin-left: 5px" @click="resetSearchForm">重置</a-button>
                 </a-col>
               </a-row>
             </a-form>

+ 23 - 6
src/views/financialManagement/accountStatement/queryPart.vue

@@ -5,17 +5,17 @@
       <div style="width:100%">
         <a-form layout="inline" @keyup.enter.native="$refs.chooseTable.refresh(true)">
           <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
+            <a-col :md="4" :sm="24">
               <a-form-item label="时间">
                 <rangeDate id="accountStatement-query-rangeDate" ref="rangeDate" :value="creatDate" @change="dateChange" />
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="4" :sm="24">
               <a-form-item label="业务单号">
                 <a-input id="accountStatement-query-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入业务单号"/>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="4" :sm="24">
               <a-form-item label="借贷类型">
                 <v-select
                   v-model="queryParam.changeType"
@@ -26,7 +26,7 @@
                   allowClear></v-select>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="4" :sm="24">
               <a-form-item label="业务类型">
                 <v-select
                   v-model="queryParam.bizType"
@@ -37,7 +37,7 @@
                   allowClear></v-select>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="4" :sm="24" v-if="queryParam.bizType&&queryParam.bizType!='FINANCE_BOOK'&&queryParam.bizType!='CHANGE'">
               <a-form-item label="业务状态">
                 <!-- 备货单状态,销售退货单,调拨单,费用报销单 -->
                 <v-select
@@ -45,6 +45,7 @@
                   ref="bizStatus"
                   id="accountStatement-query-bizStatus"
                   :code="bizStatusCode"
+                  :notIn="bizStatusNoCode"
                   placeholder="请选择业务状态"
                   allowClear></v-select>
               </a-form-item>
@@ -163,7 +164,7 @@ export default {
               if (data.list[i].bizAmount > 0) {
                 data.list[i].debitAmount = data.list[i].bizAmount
               } else {
-                data.list[i].creditorAmount = data.list[i].bizAmount
+                data.list[i].creditorAmount = data.list[i].bizAmount * -1
               }
             }
           }
@@ -185,6 +186,22 @@ export default {
     bizStatusCode () {
       return this.codeArr[this.queryParam.bizType]
     },
+    bizStatusNoCode () {
+      const arr = [
+        'STOCK_UP_REJECT',
+        'WAIT_SUBMIT',
+        'AUDIT_REJECT',
+        'WAIT_CHECK',
+        'FINANCIAL_REJECT',
+        'CANCEL',
+        'WAIT_RECEIVE',
+        'WAIT_CUSTOMER_SERVICE_CONFIRM'
+      ]
+      if (this.queryParam.bizType == 'SALES_RETURN') {
+        arr.push('WAIT_AUDIT')
+      }
+      return arr
+    },
     columns () {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },