Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue

@@ -723,6 +723,7 @@ export default {
         receiveCompany: value.receiveCompany, // 收款单位名称
         receiveCompanySid: value.receiveCompanySid, // 收款单位sid
         bank: value.bank, // 开户行
+        bankShortName: value.bankShortName, // 银行简称
         receivingAccount: value.receivingAccount, // 收款银行账号
         payAccount: value.payAccount, // 付款金额
         detailSid: '', // 付款申请明细sid

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/paymentInformationAdd.vue

@@ -95,6 +95,13 @@
                   <el-input @keyup.native="scope.row.exePayPrice = getNumber(scope.row.exePayPrice, 2)" v-model="scope.row.exePayPrice" clearable placeholder="" />
                 </template>
               </el-table-column>
+              <el-table-column label="收款银行账号" align="center">
+                <template slot-scope="scope">
+                  <el-select v-model="scope.row.receivingAccount" placeholder="请选择" clearable filterable>
+                    <el-option v-for="item in receivingAccount_list" :key="item.sid" :label="item.receivingAccount" :value="item.receivingAccount"></el-option>
+                  </el-select>
+                </template>
+              </el-table-column>
               <el-table-column label="备注" align="center">
                 <template slot-scope="scope">
                   <el-input v-model="scope.row.remarks" clearable placeholder="" />
@@ -129,11 +136,9 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <div class="span-sty">业务类型</div>
+            <div class="span-sty">银行简称</div>
             <el-form-item>
-              <el-select class="addinputInfo" v-model="temp.businessTypeValue" placeholder="请选择" @change="businessTypeChange" clearable filterable>
-                <el-option v-for="item in businessType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
-              </el-select>
+              <el-input class="addinputInfo addinputw" v-model="temp.bankShortName" clearable  placeholder=""/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -165,7 +170,7 @@ export default {
       costTitle_list: [],
       payment_list: [],
       receiveCompany_list: [],
-      businessType_list: [],
+      receivingAccount_list: [],
       formobj: {
         sid: '', // sid
         costTitleKey: '', // 款项名称，数据字典
@@ -174,6 +179,7 @@ export default {
         paymentType: '', // 付款方式value
         receiveCompany: '', // 收款单位名称
         receiveCompanySid: '', // 收款单位sid
+        bankShortName: '', // 银行简称
         bank: '', // 开户行
         receivingAccount: '', // 收款银行账号
         payAccount: '', // 付款金额
@@ -187,8 +193,7 @@ export default {
         companyName: '', // 单位名称
         bank: '', // 开户行
         receivingAccount: '', // 收款银行账号
-        businessTypeKey: '', // 业务类型key
-        businessTypeValue: '', // 业务类型value
+        bankShortName: '',
         remarks: '', // 备注
         useOrgSid: '', // 分公司sid
         useOrgName: ''
@@ -214,11 +219,6 @@ export default {
           this.payment_list = res.data
         }
       })
-      typeValues({ type: 'cw_businessType' }).then((res) => {
-        if (res.success) {
-          this.businessType_list = res.data
-        }
-      })
     },
     showAdd(useOrgSid) {
       this.viewTitle = '【新增】付款信息'
@@ -258,22 +258,22 @@ export default {
       const choose = this.costTitle_list.filter((item) => item.dictValue === value)
       if (choose !== null && choose.length > 0) {
         this.formobj.costTitleKey = choose[0].dictKey
+        if (value === '银行保证金') {
+          this.formobj.isPay = '1'
+        } else {
+          this.formobj.isPay = '0'
+        }
       } else {
         this.formobj.costTitleKey = ''
+        this.formobj.isPay = ''
       }
     },
     paymentChange(value) {
       const choose = this.payment_list.filter((item) => item.dictValue === value)
       if (choose !== null && choose.length > 0) {
         this.formobj.paymentTypeKey = choose[0].dictKey
-        if (value === '银行保证金') {
-          this.formobj.isPay = '1'
-        } else {
-          this.formobj.isPay = '0'
-        }
       } else {
         this.formobj.paymentTypeKey = ''
-        this.formobj.isPay = ''
       }
     },
     receiveCompanyChange(value) {
@@ -282,10 +282,27 @@ export default {
         this.formobj.receiveCompanySid = choose[0].sid
         this.formobj.receiveCompany = choose[0].companyName
         this.formobj.bank = choose[0].bank
+        this.formobj.bankShortName = choose[0].bankShortName
+        if (this.formobj.costTitleValue === '银行保证金') {
+          if (this.receiveCompany_list.length > 0) {
+            this.receivingAccount_list = []
+            this.receiveCompany_list.forEach((e) => {
+              if (e.companyName === this.formobj.receiveCompany && e.bank === this.formobj.bank) {
+                this.receivingAccount_list.push({
+                  sid: e.sid,
+                  receivingAccount: e.receivingAccount
+                })
+              }
+            })
+          }
+        } else {
+          this.receivingAccount_list = []
+        }
       } else {
         this.formobj.receiveCompanySid = ''
         this.formobj.receiveCompany = ''
         this.formobj.bank = ''
+        this.formobj.bankShortName = ''
       }
     },
     receiveCompanyAdd() {
@@ -306,8 +323,7 @@ export default {
       this.temp.companyName = '' // 单位名称
       this.temp.bank = '' // 开户行
       this.temp.receivingAccount = '' // 收款银行账号
-      this.temp.businessTypeKey = '' // 业务类型key
-      this.temp.businessTypeValue = '' // 业务类型value
+      this.temp.bankShortName = ''
       this.temp.remarks = '' // 备注
     },
     toAdd() {
@@ -332,14 +348,6 @@ export default {
     toDelete(index) {
       this.formobj.finPaymentapplyDetailsBelowEveList.splice(index, 1)
     },
-    businessTypeChange(value) {
-      const choose = this.businessType_list.filter((item) => item.dictValue === value)
-      if (choose !== null && choose.length > 0) {
-        this.temp.businessTypeKey = choose[0].dictKey
-      } else {
-        this.temp.businessTypeKey = ''
-      }
-    },
     saveOrUpdate() {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
@@ -358,6 +366,7 @@ export default {
         receiveCompany: '', // 收款单位名称
         receiveCompanySid: '', // 收款单位sid
         bank: '', // 开户行
+        bankShortName: '', // 银行简称
         receivingAccount: '', // 收款银行账号
         payAccount: '', // 付款金额
         detailSid: '', // 付款申请明细sid

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/paymentInformationInfo.vue

@@ -56,6 +56,7 @@
               <el-table-column prop="period" label="期数" align="center" />
               <el-table-column prop="exePayDate" label="平仓付款日期" align="center" />
               <el-table-column prop="exePayPrice" label="平仓付款金额" align="center" />
+              <el-table-column prop="receivingAccount" label="收款银行账号" align="center" />
               <el-table-column prop="remarks" label="备注" align="center" />
             </el-table>
           </div>

yxt-as-ui/src/views/storage/receivingGoods/index.vue

@@ -243,7 +243,7 @@ export default {
     showUpShelfBill(row) {
       this.dialogVisible = false
       this.viewState = 6
-      this.$refs['upShelfInfo'].showEdit(row.billSid)
+      this.$refs['upShelfInfo'].showEdit({ sid: row.billSid })
     },
     resetState2() {
       this.viewState = 1

yxt-as-ui/src/views/storage/upShelf/upShelfAdd.vue

@@ -222,7 +222,7 @@ export default {
       this.formobj.list.splice(index, 1)
     },
     inputCount(row) {
-      if (row.count !== '' && row.maxCount !== '' && parseFloat(row.count) - parseFloat(row.maxCount) < 0) {
+      if (row.count !== '' && row.maxCount !== '' && parseFloat(row.count) - parseFloat(row.maxCount) > 0) {
         row.count = row.maxCount
       }
     }