修改bug

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -2798,6 +2798,14 @@ export default {
     editCustomer(isBack = false, type) {
       this.$refs["form"].validate((valid) => {
         if (valid) {
+          const length = this.goodsActives === 'gift'? this.contactsData.length: this.goodsShowData.length
+          for (let i = 0;i < length;i++) {
+            const data = this.goodsActives === 'gift'? this.contactsData: this.goodsShowData;
+            console.log(data[i])
+            if (Number(data[i].orderQuantity) > Number(data[i].storageQuantity)) {
+              return this.$message.error('商品信息第' + (Number(i) + 1) + '行订货数量大于库存数量')
+            }
+          }
           //商品信息
           if (this.goodsActives == 'gift') {
             this.form.orderItemsList = this.goodsShowData.concat(this.contactsData)

src/views/workManagement/warehousing/detail.vue

@@ -25,7 +25,7 @@
           icon="el-icon-folder-add"
           @click="confirmReceipt"
           :loading="btnLoading"
-          :disabled="disabled"
+          :disabled="disabled || !form.id"
         >确认入库</el-button>
         <el-button
           v-else
@@ -557,6 +557,7 @@ export default {
     this.getWorkDicts('unit').then(res => {
       this.unitOption = res.data.data;
     })
+    this.$set(this.form, 'status', 3);
 
     if (this.detailData.query) {
       this.disabled = true;

src/views/workManagement/warehousing/index.vue

@@ -24,7 +24,7 @@
           <el-button
             size="small"
             type="primary"
-            icon="el-icon-add"
+            icon="el-icon-plus"
             @click.stop="newAdd()"
           >创建单据</el-button>
         </template>
@@ -111,6 +111,7 @@ export default {
       this.option.searchMenuSpan = num * 8;
       this.option.searchMenuPosition = "right";
     }
+    this.option.height = window.innerHeight - 240;
   },
   methods: {
     searchCriteriaSwitch(type) {
@@ -146,10 +147,10 @@ export default {
       getList(queryParams).then(res => {
         this.dataList = res.data.data.records;
         this.page.total = res.data.data.total;
-        this.option.height = window.innerHeight - 240;
         this.$nextTick(() => {
           this.$refs.crud.doLayout()
         })
+        this.option.height = window.innerHeight - 240;
       }).finally(() => {
         this.loading = false;
       })