Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentInformation/paymentInformation.vue

@@ -15,8 +15,8 @@
               <el-form-item label="银行账号">
                 <el-input v-model="listQuery.params.receivingAccount" placeholder="" clearable/>
               </el-form-item>
-              <el-form-item label="业务类型">
+              <el-form-item label="开户行">
-                <el-input v-model="listQuery.params.businessTypeValue" placeholder="" clearable/>
+                <el-input v-model="listQuery.params.bank" placeholder="" clearable/>
               </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
@@ -44,7 +44,7 @@
             <el-table-column prop="companyName" label="单位名称" align="center" />
             <el-table-column prop="bank" label="开户行" align="center" />
             <el-table-column prop="receivingAccount" label="银行账号" align="center" />
-            <el-table-column prop="businessTypeValue" label="业务类型" align="center" />
+            <el-table-column prop="bankShortName" label="银行简称" align="center" />
             <el-table-column prop="remarks" label="备注" align="center" />
           </el-table>
         </div>
@@ -81,12 +81,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <div class="span-sty">业务类型</div>
+            <div class="span-sty">银行简称</div>
-            <el-form-item>
+            <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.bankShortName" clearable placeholder="" /></el-form-item>
-              <el-select class="addinputInfo" v-model="formobj.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-form-item>
           </el-col>
           <el-col :span="12">
             <div class="span-sty">备注</div>
@@ -125,8 +121,7 @@ export default {
         companyName: '', // 单位名称
         bank: '', // 开户行
         receivingAccount: '', // 收款银行账号
-        businessTypeKey: '', // 业务类型key
+        bankShortName: '',
-        businessTypeValue: '', // 业务类型value
         remarks: '', // 备注
         useOrgSid: '', // 分公司sid
         useOrgName: ''
@@ -171,7 +166,7 @@ export default {
         params: {
           companyCode: '',
           companyName: '',
-          businessTypeValue: '',
+          bank: '',
           orgPath: '',
           menuUrl: '',
           userSid: ''
@@ -265,7 +260,7 @@ export default {
         params: {
           companyCode: '',
           companyName: '',
-          businessTypeValue: '',
+          bank: '',
           orgPath: '',
           menuUrl: '',
           userSid: ''
@@ -326,8 +321,7 @@ export default {
         companyName: '', // 单位名称
         bank: '', // 开户行
         receivingAccount: '', // 收款银行账号
-        businessTypeKey: '', // 业务类型key
+        bankShortName: '',
-        businessTypeValue: '', // 业务类型value
         remarks: '', // 备注
         useOrgSid: '', // 分公司sid
         useOrgName: ''

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

@@ -223,6 +223,18 @@ export default {
     saveOrUpdate() {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
+          if (this.formobj.list.length === 0) {
+            this.$message({ showClose: true, type: 'error', message: '商品列表不能为空' })
+            return
+          }
+          for (var i = 0; i < this.formobj.list.length; i++) {
+            if (this.formobj.list[i].actualInCount === '' ) {
+              this.$message({ showClose: true, type: 'error', message: '实收数量不能为空' })
+              return
+            } else if (parseFloat(this.formobj.list[i].actualInCount) < 1) {
+              this.$message({ showClose: true, type: 'error', message: '实收数量不能为零' })
+            }
+          }
           this.submitdisabled = true
           req.save(this.formobj).then((res) => {
             if (res.success) {
@@ -245,14 +257,11 @@ export default {
             return
           }
           for (var i = 0; i < this.formobj.list.length; i++) {
-            var item = this.formobj.list[i]
+            if (this.formobj.list[i].actualInCount === '' ) {
-            if (item.actualInCount == 0) {
+              this.$message({ showClose: true, type: 'error', message: '实收数量不能为空' })
-              this.$message({
-                showClose: true,
-                type: 'error',
-                message: '实收数量不能为空'
-              })
               return
+            } else if (parseFloat(this.formobj.list[i].actualInCount) < 1) {
+              this.$message({ showClose: true, type: 'error', message: '实收数量不能为零' })
             }
           }
           this.submitdisabled = true