lilei 1 napja
szülő
commit
73336514fb

+ 1 - 1
public/version.json

@@ -1,4 +1,4 @@
 {
-    "version": "2.2.062",
+    "version": "2.2.063",
     "message": "发现有新版本发布,确定更新系统?"
 }

+ 8 - 5
src/views/financialManagement/accountStatement/edit.vue

@@ -136,6 +136,7 @@
       :show="baseModal"
       type="1"
       :itemSn="verifyAccountBillSn"
+      :dealerSn="dealerSn"
       @cancel="baseModal=false"
       @ok="hanldAudit"></baseTzModal>
   </div>
@@ -181,7 +182,8 @@ export default {
         endDate: '',
         bizNo: '',
         changeType: undefined,
-        bizType: undefined
+        bizType: undefined,
+        bizStatus: undefined
       },
       creatDate: [],
       chooseList: [],
@@ -285,15 +287,15 @@ export default {
         centered: true,
         closable: true,
         onOk () {
-          _this.delDetail([row.detailSn])
+          _this.delDetail([row.detailSn], 1)
         }
       })
     },
-    delDetail (snList) {
+    delDetail (snList, type) {
       const _this = this
       _this.delLoading = true
       _this.spinning = true
-      verifyAcountBillDetailDel({ verifyAccountBillSn: _this.verifyAccountBillSn, detailSnList: snList })
+      verifyAcountBillDetailDel({ verifyAccountBillSn: _this.verifyAccountBillSn, detailSnList: snList, cascadeFlag: type })
         .then(res => {
           if (res.status == 200) {
             _this.resetTable(false)
@@ -320,6 +322,7 @@ export default {
       this.productForm.changeType = undefined
       this.productForm.bizType = undefined
       this.productForm.bizStatus = undefined
+      this.productForm.bizStatus = undefined
       this.creatDate = []
       this.$refs.rangeDate.resetDate(this.creatDate)
       this.$refs.table.refresh(!!flag)
@@ -406,7 +409,7 @@ export default {
           centered: true,
           closable: true,
           onOk () {
-            _this.delDetail(snList)
+            _this.delDetail(snList, 0)
           }
         })
       }

+ 1 - 1
src/views/financialManagement/accountStatement/list.vue

@@ -89,7 +89,7 @@
           <template slot="action" slot-scope="text, record">
             <div>
               <a-button
-                v-if="record.syncFlag=='0'"
+                v-if="record.syncFlag=='0'&&(record.billStatus=='FINISH'||record.billStatus=='WAIT_VERIFY')"
                 size="small"
                 type="link"
                 class="button-info"

+ 4 - 2
src/views/financialManagement/accountStatement/queryPart.vue

@@ -37,7 +37,7 @@
                   allowClear></v-select>
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24" v-if="queryParam.bizType&&queryParam.bizType!='FINANCE_BOOK'&&queryParam.bizType!='CHANGE'">
+            <a-col :md="4" :sm="24" v-if="queryParam.bizType&&queryParam.bizType!='FINANCE_BOOK'">
               <a-form-item label="业务状态">
                 <!-- 备货单状态,销售退货单,调拨单,费用报销单 -->
                 <v-select
@@ -191,7 +191,6 @@ export default {
     bizStatusNoCode () {
       const arr = [
         'STOCK_UP_REJECT',
-        'WAIT_SUBMIT',
         'AUDIT_REJECT',
         'WAIT_CHECK',
         'FINANCIAL_REJECT',
@@ -202,6 +201,9 @@ export default {
       if (this.queryParam.bizType == 'SALES_RETURN') {
         arr.push('WAIT_AUDIT')
       }
+      if (this.queryParam.bizType !== 'CHANGE') {
+        arr.push('WAIT_SUBMIT')
+      }
       return arr
     },
     columns () {

+ 12 - 1
src/views/financialManagement/manualEntryForm/baseModal.vue

@@ -17,7 +17,7 @@
         :label-col="formItemLayout.labelCol"
         :wrapper-col="formItemLayout.wrapperCol">
         <a-form-model-item label="客户名称" prop="dealerSn">
-          <dealerSubareaScopeList id="manualEntryForm-dealer" :disabled="!!itemSn&&type == 0" ref="settleClientName" @change="custChange" />
+          <dealerSubareaScopeList id="manualEntryForm-dealer" :disabled="!!itemSn&&type == 0||type==1" ref="settleClientName" @change="custChange" />
         </a-form-model-item>
         <a-form-model-item label="借贷类型" prop="changeType">
           <v-select
@@ -69,6 +69,10 @@ export default {
       type: String,
       default: ''
     },
+    dealerSn: {
+      type: String,
+      default: ''
+    },
     type: {
       type: String,
       default: '0'
@@ -205,6 +209,13 @@ export default {
       if (this.itemSn && this.type == 0) {
         this.getDetail()
       }
+      // 回显客户
+      if (this.type == 1) {
+        this.$nextTick(() => {
+          this.form.dealerSn = this.dealerSn
+          this.$refs.settleClientName.getDetail(this.dealerSn)
+        })
+      }
     }
   },
   watch: {

+ 1 - 1
src/views/financialManagement/manualEntryForm/list.vue

@@ -174,7 +174,7 @@ export default {
                 data.list[i].borrowAmount = this.toThousands(data.list[i].changeAmount, 2)
               }
               // 贷方
-              if (data.list[i].changeType == 'LENDER') {
+              if (data.list[i].changeType == 'CREDIT') {
                 data.list[i].loanAmount = this.toThousands(data.list[i].changeAmount * -1, 2)
               }
             }