入库供应商改为必填

src/views/modules/materialManagement/wareHouse/WareHouseAddForm.vue

@@ -106,6 +106,7 @@
               <vxe-column min-width="100" align="center" field="purchaserAgent" title="采购人" ></vxe-column>
               <vxe-column min-width="100" align="center" field="procurementOffice" title="采购部门" ></vxe-column>
               <vxe-column min-width="100" align="center" field="procurementType" title="采购类型" ></vxe-column>
+              <vxe-column min-width="100" align="center" field="supplierName" title="供应商" ></vxe-column>
               <vxe-column min-width="220" align="center" field="tradeName"  title="商品名称" ></vxe-column>
               <vxe-column min-width="100" align="center" field="tradePrice" title="商品单价(元)" ></vxe-column>
               <vxe-column min-width="80" align="center" field="tradeNumber" title="商品数量" ></vxe-column>
@@ -144,7 +145,7 @@
             :edit-rules="validRules"
             :key="tableKey"
           >
-            <vxe-table-column min-width="100px" align="center" field="wareHouseMan" title="入库人" :edit-render="{}" :rules="[{required: true, message:'请选择入库人', trigger:'blur'}]">
+            <vxe-table-column min-width="100px" align="center" field="wareHouseMan" title="入库人" :edit-render="{}">
               <template v-slot:edit="scope">
                 <el-input v-model="scope.row.wareHouseMan" @focus="userPullListForm(scope.$rowIndex)"></el-input>
               </template>
@@ -154,12 +155,12 @@
                 <el-input :disabled='true' v-model="scope.row.wareHouseManOffice" ></el-input>
               </template>
             </vxe-table-column>
-            <vxe-table-column min-width="100px" align="center" field="wareHouseType" title="入库类型" :edit-render="{}" :rules="[{required: true, message:'请选择采购类型', trigger:'blur'}]">
+            <vxe-table-column min-width="100px" align="center" field="wareHouseType" title="入库类型" :edit-render="{}" >
               <template v-slot:edit="scope">
                 <el-input v-model="scope.row.wareHouseType" @focus="typePullForm(scope.$rowIndex)"></el-input>
               </template>
             </vxe-table-column>
-            <vxe-table-column min-width="100px" align="center" field="supplierName" title="供应商" :edit-render="{}" :rules="[{required: true, message:'请选择供应商', trigger:'blur'}]">
+            <vxe-table-column min-width="100px" align="center" field="supplierName" title="供应商" :edit-render="{}">
               <template v-slot:edit="scope">
                 <vxe-pulldown ref="xDown4" transfer>
                   <template #default>
@@ -190,7 +191,7 @@
                 </vxe-pulldown>
               </template>
             </vxe-table-column>
-            <vxe-table-column min-width="180px" align="center" field="tradeName" title="商品名称" :edit-render="{}" :rules="[{required: true, message:'请填写商品名称', trigger:'blur'}]">
+            <vxe-table-column min-width="180px" align="center" field="tradeName" title="商品名称" :edit-render="{}">
               <template v-slot:edit="scope">
                 <el-input @change="ifSameValue" maxlength="64" v-model="scope.row.tradeName"></el-input>
               </template>
@@ -201,12 +202,12 @@
                 <el-input @change="changeValue2" v-model="scope.row.tradeNumber" @blur="scope.row.tradeNumber = twoDecimalPlaces2(scope.row.tradeNumber)" maxlength="10"></el-input>
               </template>
             </vxe-table-column>
-            <vxe-table-column min-width="80px" align="center" field="company" title="单位" :edit-render="{}" :rules="[{required: true, message:'请填写单位', trigger:'blur'}]">
+            <vxe-table-column min-width="80px" align="center" field="company" title="单位" :edit-render="{}">
               <template v-slot:edit="scope">
                 <el-input maxlength="64" v-model="scope.row.company"></el-input>
               </template>
             </vxe-table-column>
-            <vxe-table-column min-width="80px" align="center" field="tradePrice" title="商品单价(元)" :edit-render="{}" :rules="[{required: true, message:'请输入商品单价', trigger:'blur'}]">
+            <vxe-table-column min-width="80px" align="center" field="tradePrice" title="商品单价(元)" :edit-render="{}">
               <template v-slot:edit="scope">
                 <el-input @change="changeValue2" maxlength="15" v-model="scope.row.tradePrice" @blur="scope.row.tradePrice = twoDecimalPlaces2(scope.row.tradePrice)"></el-input>
               </template>
@@ -275,16 +276,16 @@
       return {
         validRules: {
           wareHouseMan: [
-            {required: true, message: '采购人不能为空'}
-          ],
-          wareHouseManOffice: [
-            {required: true, message: '入库部门不能为空'}
+            { required: true, message: '请选择入库人' }
           ],
           wareHouseType: [
-            {required: true, message: '入库类型不能为空'}
+            { required: true, message: '请选择入库类型' }
+          ],
+          supplierName: [
+            { required: true, message: '请选择供应商' }
           ],
           tradeName: [
-            {required: true, message: '商品名称不能为空'}
+            { required: true, message: '请填写商品名称' }
           ],
           tradeNumber: [
             {required: true, message: '商品数量不能为空'}
@@ -727,6 +728,22 @@
                   this.loading = false
                   return
                 }
+                if (this.commonJS.isEmpty(this.inputForm.wareHouse[j].supplierName)) {
+                  this.$message.error('入库详情第' + k + '行请选择供应商')
+                  this.loading = false
+                  return
+                }
+                if (this.commonJS.isEmpty(this.inputForm.wareHouse[j].tradeName)) {
+                  this.$message.error('入库详情第' + k + '行请填写商品名称')
+                  this.loading = false
+                  return
+                }
+                if (this.commonJS.isEmpty(this.inputForm.wareHouse[j].tradeNumber)) {
+                  this.$message.error('入库详情第' + k + '行请填写商品数量')
+                  this.loading = false
+                  this.inputForm.functionFlag = ''
+                  return
+                }
               }
             }
             this.inputForm.files = this.$refs.uploadComponent.getDataList()

src/views/modules/materialManagement/wareHouse/WareHouseUpdateForm.vue

@@ -90,6 +90,7 @@
             <vxe-column min-width="100" align="center" field="purchaserAgent" title="采购人" ></vxe-column>
             <vxe-column min-width="100" align="center" field="procurementOffice" title="采购部门" ></vxe-column>
             <vxe-column min-width="100" align="center" field="procurementType" title="采购类型" ></vxe-column>
+            <vxe-column min-width="100" align="center" field="supplierName" title="供应商" ></vxe-column>
             <vxe-column min-width="220" align="center" field="tradeName"  title="商品名称" ></vxe-column>
             <vxe-column min-width="100" align="center" field="tradePrice" title="商品单价(元)" ></vxe-column>
             <vxe-column min-width="80" align="center" field="tradeNumber" title="商品数量" ></vxe-column>
@@ -162,7 +163,7 @@
           :edit-config="{trigger: 'click', mode: 'row', showStatus: false, autoClear: true, icon: '-'}"
           :edit-rules="validRules"
         >
-          <vxe-table-column min-width="100px" align="center" field="wareHouseMan" title="入库人" :edit-render="{}" :rules="[{required: true, message:'请选择入库人', trigger:'blur'}]">
+          <vxe-table-column min-width="100px" align="center" field="wareHouseMan" title="入库人" :edit-render="{}" >
             <template v-slot:edit="scope">
               <el-input v-model="scope.row.wareHouseMan" @focus="userPullListForm(scope.$rowIndex)"></el-input>
             </template>
@@ -172,12 +173,12 @@
               <el-input :disabled='true' v-model="scope.row.wareHouseManOffice" ></el-input>
             </template>
           </vxe-table-column>
-          <vxe-table-column min-width="100px" align="center" field="wareHouseType" title="入库类型" :edit-render="{}" :rules="[{required: true, message:'请选择采购类型', trigger:'blur'}]">
+          <vxe-table-column min-width="100px" align="center" field="wareHouseType" title="入库类型" :edit-render="{}" >
             <template v-slot:edit="scope">
               <el-input v-model="scope.row.wareHouseType" @focus="typePullForm(scope.$rowIndex)"></el-input>
             </template>
           </vxe-table-column>
-          <vxe-table-column min-width="100px" align="center" field="supplierName" title="供应商" :edit-render="{}" :rules="[{required: true, message:'请选择供应商', trigger:'blur'}]">
+          <vxe-table-column min-width="100px" align="center" field="supplierName" title="供应商" :edit-render="{}" >
             <template v-slot:edit="scope">
               <vxe-pulldown ref="xDown4" transfer>
                 <template #default>
@@ -207,7 +208,7 @@
               </vxe-pulldown>
             </template>
           </vxe-table-column>
-          <vxe-table-column min-width="180px" align="center" field="tradeName" title="商品名称" :edit-render="{}" :rules="[{required: true, message:'请填写商品名称', trigger:'blur'}]">
+          <vxe-table-column min-width="180px" align="center" field="tradeName" title="商品名称" :edit-render="{}" >
             <template v-slot:edit="scope">
               <el-input @change="ifSameValue" maxlength="64" v-model="scope.row.tradeName"></el-input>
             </template>
@@ -218,12 +219,12 @@
               <el-input @change="changeValue2" v-model="scope.row.tradeNumber" @blur="scope.row.tradeNumber = twoDecimalPlaces2(scope.row.tradeNumber)" maxlength="10"></el-input>
             </template>
           </vxe-table-column>
-          <vxe-table-column min-width="80px" align="center" field="company" title="单位" :edit-render="{}" :rules="[{required: true, message:'请填写单位', trigger:'blur'}]">
+          <vxe-table-column min-width="80px" align="center" field="company" title="单位" :edit-render="{}" >
             <template v-slot:edit="scope">
               <el-input maxlength="64" v-model="scope.row.company"></el-input>
             </template>
           </vxe-table-column>
-          <vxe-table-column min-width="80px" align="center" field="tradePrice" title="商品单价(元)" :edit-render="{}" :rules="[{required: true, message:'请输入商品单价', trigger:'blur'}]">
+          <vxe-table-column min-width="80px" align="center" field="tradePrice" title="商品单价(元)" :edit-render="{}" >
             <template v-slot:edit="scope">
               <el-input @change="changeValue2" maxlength="15" v-model="scope.row.tradePrice" @blur="scope.row.tradePrice = twoDecimalPlaces2(scope.row.tradePrice)"></el-input>
             </template>
@@ -301,16 +302,16 @@
       return {
         validRules: {
           wareHouseMan: [
-            {required: true, message: '采购人不能为空'}
-          ],
-          wareHouseManOffice: [
-            {required: true, message: '入库部门不能为空'}
+            { required: true, message: '请选择入库人' }
           ],
           wareHouseType: [
-            {required: true, message: '入库类型不能为空'}
+            { required: true, message: '请选择入库类型' }
+          ],
+          supplierName: [
+            { required: true, message: '请选择供应商' }
           ],
           tradeName: [
-            {required: true, message: '商品名称不能为空'}
+            { required: true, message: '请填写商品名称' }
           ],
           tradeNumber: [
             {required: true, message: '商品数量不能为空'}
@@ -692,6 +693,24 @@
                 this.inputForm.functionFlag = ''
                 return
               }
+              if (this.commonJS.isEmpty(this.inputForm.wareHouse[j].supplierName)) {
+                this.$message.error('入库详情第' + k + '行请选择供应商')
+                this.loading = false
+                this.inputForm.functionFlag = ''
+                return
+              }
+              if (this.commonJS.isEmpty(this.inputForm.wareHouse[j].tradeName)) {
+                this.$message.error('入库详情第' + k + '行请填写商品名称')
+                this.loading = false
+                this.inputForm.functionFlag = ''
+                return
+              }
+              if (this.commonJS.isEmpty(this.inputForm.wareHouse[j].tradeNumber)) {
+                this.$message.error('入库详情第' + k + '行请填写商品数量')
+                this.loading = false
+                this.inputForm.functionFlag = ''
+                return
+              }
             }
             this.inputForm.files = this.$refs.uploadComponent.getDataList()
             this.inputForm.status = '2'