7ad

src/utils/dict/warehouse.js

@@ -34,13 +34,13 @@ export const warehousingType = [
 export const sceneState = [
   { code: 1, label: '生产入库' },
   { code: 2, label: '采购入库' },
-  { code: 3, label: '赠送入库' },
+  { code: 3, label: '归还入库' },
   { code: 4, label: '借用入库' },
   // { code: 5, label: '退还入库' },
   { code: 6, label: '其他入库' }
 ];
 export const outputSceneState = [
-  { code: 1, label: '退供出库' },
+  { code: 1, label: '退货出库' },
   { code: 2, label: '调拨出库' },
   { code: 3, label: '销售出库' },
   { code: 4, label: '领用出库' },

src/views/warehouseManagement/components/AssetsDialog.vue

@@ -171,7 +171,7 @@
           ></el-table-column>
 
           <el-table-column
-            prop="availableCountBase"
+            prop="packingCountBase"
             label="包装库存数量"
             width="120"
             v-if="dimension != 4"
@@ -183,7 +183,7 @@
             width="90"
           ></el-table-column>
           <el-table-column
-            prop="packingCountBase"
+            prop="availableCountBase"
             label="计量库存数量"
             width="120"
           ></el-table-column>
@@ -315,6 +315,7 @@
         // await this.$refs.multipleTable.clearSelection();
         // this.selectionList = [];
         console.log('===1', this.warehousingMaterialList);
+        console.log('===2', e);
         // if (is != 'page') {
         //   this.$refs.multipleTable.clearSelection();
         // }
@@ -345,7 +346,7 @@
               ...item,
               batchNo: item.batchNum,
               minUnit: item.packingUnit,
-              availableCountBase: 1,
+              // availableCountBase: 1,
               oid: item.id,
               assetCode: item.code
             };

src/views/warehouseManagement/components/selectType.vue

@@ -57,11 +57,11 @@
               label="物品名称"
               :show-overflow-tooltip="true"
             ></el-table-column>
-            <el-table-column
+            <!-- <el-table-column
               prop="brandNum"
               label="牌号"
               :show-overflow-tooltip="true"
-            ></el-table-column>
+            ></el-table-column> -->
             <el-table-column
               :prop="item.prop"
               :show-overflow-tooltip="true"

src/views/warehouseManagement/outgoingManagement/add.vue

@@ -36,9 +36,11 @@
             <el-form-item
               :label="
                 formData.bizType == 3
-                  ? '销售订单'
+                  ? '销售发货单'
                   : formData.bizType == 4
                   ? '领料单'
+                  : formData.bizType == 1
+                  ? '采购退货单'
                   : '来源单据'
               "
               prop="sourceBizNo"
@@ -68,9 +70,11 @@
             <el-form-item
               :label="
                 formData.bizType == 3
-                  ? '销售订单'
+                  ? '销售发货单'
                   : formData.bizType == 4
                   ? '领料单'
+                  : formData.bizType == 1
+                  ? '采购退货单'
                   : '来源单据'
               "
               v-else
@@ -315,7 +319,9 @@
       </el-form>
 
       <div class="material">
-        <el-button type="primary" @click="addStock">添加</el-button>
+        <div style="width: 100%; text-align: right"
+          ><el-button type="primary" @click="addStock">添加</el-button></div
+        >
         <div v-if="dimension != 4">
           <div class="flex">
             <div><span class="red">*</span>物品清单</div>
@@ -524,13 +530,13 @@
                   label="计量单位"
                   prop="measuringUnit"
                 ></el-table-column>
-                <el-table-column label="物料代号" prop="materielCode">
+                <el-table-column label="物料代号" prop="meterielCode">
                 </el-table-column>
                 <el-table-column
                   label="客户代号"
                   prop="clientCode"
                 ></el-table-column>
-                <el-table-column label="刻码" prop=""></el-table-column>
+                <el-table-column label="刻码" prop="engrave"></el-table-column>
                 <el-table-column label="重量" prop="weight"></el-table-column>
                 <el-table-column
                   label="重量单位"
@@ -741,7 +747,6 @@
         if (dimension == 4) {
           this.materialCodeReqList = data.wlList;
           this.selectionList = data.wlList;
-          console.log('====', data);
 
           let params = {
             realTimeInventoryNewPOList: data.realTimeInventoryVOList
@@ -755,7 +760,9 @@
 
               for (const wlItem of data.wlList) {
                 if (detail.id === wlItem.recordId) {
-                  detail.outInMaterialDetailsAddPOList.push({ ...wlItem });
+                  detail.outInMaterialDetailsAddPOList.push({
+                    ...wlItem
+                  });
                 }
               }
             }
@@ -764,18 +771,122 @@
 
           this.materialObj = data;
         } else if (dimension == 3) {
-          this.batchDetailsVOList = data.wlList.map((item) => {
+          //包装维度出库
+          const list = data.realTimeInventoryVOList;
+          //获取包装维度
+          let packArr = [];
+          for (const item of list) {
+            if (item.inventoryDetailsVOList.length != 0) {
+              for (const iterator of item.inventoryDetailsVOList) {
+                packArr.push({ ...iterator, batchNo: iterator.batchNum });
+              }
+            }
+          }
+          this.batchDetailsVOList = packArr.map((item) => {
             return {
               ...item,
               packingCountBase: dimension == 4 ? 1 : item.packingCountBase
             };
           });
-          this.selectionList = data.wlList;
-        } else if (dimension == 2) {
-          this.batchDetailsVOList = data.wlList;
-          this.selectionList = data.wlList;
+          //物料维度数据
+          let meteArr = [];
+          for (const item of packArr) {
+            if (item.materialDetailsVOList.length != 0) {
+              for (const iterator of item.materialDetailsVOList) {
+                meteArr.push({
+                  ...iterator
+                });
+              }
+            }
+          }
+          this.materialCodeReqList = meteArr;
+          //再次打开选择上
+          this.selectionList = list;
+          //send数据
+          this.wlParams = { realTimeInventoryNewPOList: list };
+          this.wlParams.realTimeInventoryNewPOList.forEach((item) => {
+            item.inventoryDetailsNewPOList = item.inventoryDetailsVOList;
+            item.inventoryDetailsNewPOList.forEach((ite) => {
+              ite.outInMaterialDetailsAddPOList = ite.materialDetailsVOList;
+            });
+          });
+        } else {
+          //   else if (dimension == 2) {
+          //   this.batchDetailsVOList = data.wlList;
+          //   this.selectionList = data.wlList;
+          // }
+          //物品维度出库
+          const list = data.realTimeInventoryVOList;
+          //获取包装维度
+          let packArr = [];
+          for (const item of list) {
+            if (item.inventoryDetailsVOList.length != 0) {
+              for (const iterator of item.inventoryDetailsVOList) {
+                packArr.push({ ...iterator, batchNo: iterator.batchNum });
+              }
+            }
+          }
+          this.batchDetailsVOList = packArr;
+          //物料维度数据
+          let meteArr = [];
+          for (const item of packArr) {
+            if (item.materialDetailsVOList.length != 0) {
+              for (const iterator of item.materialDetailsVOList) {
+                meteArr.push({
+                  ...iterator
+                });
+              }
+            }
+          }
+          this.materialCodeReqList = meteArr;
+          //再次打开选择上
+          this.selectionList = list;
+          //send数据
+          this.wlParams = { realTimeInventoryNewPOList: list };
+          this.wlParams.realTimeInventoryNewPOList.forEach((item) => {
+            item.inventoryDetailsNewPOList = item.inventoryDetailsVOList;
+            item.inventoryDetailsNewPOList.forEach((ite) => {
+              ite.outInMaterialDetailsAddPOList = ite.materialDetailsVOList;
+            });
+          });
         }
       },
+      handleNewSave() {
+        this.$refs.formName.validate(async (valid) => {
+          if (valid) {
+            if (!this.warehousingMaterialList?.length) {
+              return this.$message.error('请添加出库明细！');
+            }
+            let obj = { ...this.formData, type: 2 };
+
+            obj.extInfo.sourceBizNo = obj.sourceBizNo;
+            obj.fromType = obj.type;
+            this.saveLoading = true;
+            obj = { ...obj, ...this.wlParams };
+            if (this.dimension == 4) {
+              obj.num = this.materialObj.wlList.length;
+            } else {
+              obj.num = this.materialCodeReqList.length;
+            }
+            console.log('2222', obj);
+
+            try {
+              // const res = await outin.saveNew(obj);
+              // if (res.code == 0) {
+              //   this.$message.success('保存成功！');
+              // }
+              // this.$router.push('/warehouseManagement/outgoingManagement');
+              // if (res?.success) {
+              //   this.$message.success('保存成功！');
+              //   this.$router.go(-1);
+              // }
+              this.saveLoading = false;
+            } catch (error) {
+              this.saveLoading = false;
+            }
+          }
+        });
+      },
 
       onClear() {
         this.formData.sourceBizNo = '';
@@ -1039,40 +1150,6 @@
         }
         return arr;
       },
-      handleNewSave() {
-        this.$refs.formName.validate(async (valid) => {
-          if (valid) {
-            if (!this.warehousingMaterialList?.length) {
-              return this.$message.error('请添加出库明细！');
-            }
-            let obj = { ...this.formData, type: 2 };
-
-            obj.extInfo.sourceBizNo = obj.sourceBizNo;
-            obj.fromType = obj.type;
-            this.saveLoading = true;
-            obj.num = this.materialObj.wlList.length;
-            if (this.dimension == 4) {
-              obj = { ...obj, ...this.wlParams };
-            }
-            console.log('2222', obj);
-
-            try {
-              const res = await outin.saveNew(obj);
-              if (res.code == 0) {
-                this.$message.success('保存成功！');
-              }
-              this.$router.push('/warehouseManagement/outgoingManagement');
-              if (res?.success) {
-                this.$message.success('保存成功！');
-                this.$router.go(-1);
-              }
-              this.saveLoading = false;
-            } catch (error) {
-              this.saveLoading = false;
-            }
-          }
-        });
-      },
 
       handleSave() {
         this.$refs.formName.validate(async (valid) => {

src/views/warehouseManagement/outgoingManagement/components/batchDetail.vue

@@ -12,7 +12,7 @@
       <el-table-column label="编码" prop="code"></el-table-column>
       <el-table-column label="名称" prop="name"></el-table-column>
       <el-table-column label="批次号" prop="batchNo"></el-table-column>
-      <el-table-column label="包装编码" prop="batchNo"></el-table-column>
+      <el-table-column label="包装编码" prop="code"></el-table-column>
       <el-table-column label="包装数量" prop="packageNo" width="120">
       </el-table-column>
       <el-table-column label="包装单位" prop="packingUnit"></el-table-column>

src/views/warehouseManagement/stockLedger/components/item-list.vue

@@ -179,7 +179,7 @@
             showOverflowTooltip: true
           },
           {
-            prop: 'availableCountBase',
+            prop: 'packingCountBase',
             label: '包装库存数量',
             sortable: 'custom',
             showOverflowTooltip: true,
@@ -192,7 +192,7 @@
             showOverflowTooltip: true
           },
           {
-            prop: 'packingCountBase',
+            prop: 'availableCountBase',
             label: '计量库存数量',
             sortable: 'custom',
             showOverflowTooltip: true,
@@ -480,7 +480,7 @@
                 ...item,
                 minUnit: item.packingUnit,
                 paths: item.pathName.split(',')[0],
-                availableCountBase: 1,
+                // availableCountBase: 1,
                 packagingCode: item.code,
                 qualityResult:
                   typeof item.qualityResult != 'number'

src/views/warehouseManagement/stockManagement/add.vue

@@ -100,7 +100,7 @@
           <el-col :span="8">
             <el-form-item
               v-if="formData.bizType == 2"
-              label="采购订单"
+              label="采购收货单"
               prop="documentSource"
             >
               <el-input
@@ -117,7 +117,7 @@
             </el-form-item>
             <el-form-item
               v-if="formData.bizType == 1"
-              label="生产订单"
+              label="生产工单"
               prop="documentSource"
             >
               <el-input
@@ -126,7 +126,11 @@
                 v-model="formData.extInfo.documentSource"
             /></el-form-item>
             <el-form-item
-              v-if="formData.bizType != 1 && formData.bizType != 2"
+              v-if="
+                formData.bizType != 1 &&
+                formData.bizType != 2 &&
+                formData.bizType != 3
+              "
               label="销售订单"
               prop="documentSource"
             >
@@ -135,6 +139,16 @@
                 clearable
                 v-model="formData.extInfo.documentSource"
             /></el-form-item>
+            <el-form-item
+              v-if="formData.bizType == 3"
+              label="出库单"
+              prop="documentSource"
+            >
+              <el-input
+                placeholder="请输入"
+                clearable
+                v-model="formData.extInfo.documentSource"
+            /></el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="权属部门" prop="deptName">
@@ -1040,6 +1054,22 @@
                 {{ row.weightUnit }}
               </template>
             </el-table-column>
+            <el-table-column label="质检结果" prop="qualityResult">
+              <template slot-scope="{ row }">
+                <el-select v-model="row.qualityResult" placeholder="请选择">
+                  <el-option value="0" label="合格"></el-option>
+                  <el-option value="1" label="不合格"></el-option>
+                </el-select>
+              </template>
+            </el-table-column>
+            <el-table-column label="质检状态" prop="qualityStatus">
+              <template slot-scope="{ row }">
+                <el-select v-model="row.qualityStatus" placeholder="请选择">
+                  <el-option value="0" label="未质检"></el-option>
+                  <el-option value="1" label="已质检"></el-option>
+                </el-select>
+              </template>
+            </el-table-column>
           </el-table>
         </div>
       </div>