huang_an 2 лет назад
Родитель
Сommit
4074010d6f

+ 1 - 1
src/api/warehouseManagement/outin.js

@@ -49,7 +49,7 @@ export default {
   },
   //出库物品实时库存
   getoutDetail: async (params) => {
-    const res = await request.get(`/wms/inout/pageInLedgerDetail`, {
+    const res = await request.get(`/wms/outin/getOutDetail`, {
       params
     });
     if (res.data.code == 0) {

+ 25 - 16
src/views/warehouseManagement/outgoingManagement/add.vue

@@ -343,7 +343,7 @@
                 <el-table-column
                   :label="`${title}编码`"
                   min-width="100"
-                  prop="onlyCode"
+                  prop="sourceBizNo"
                 ></el-table-column>
                 <el-table-column
                   label="批次号"
@@ -352,14 +352,14 @@
                 <el-table-column label="生产日期" width="200">
                   <template slot-scope="{ row }">
                     <span v-if="row.dateType === 2">
-                      {{ row.manufactureTime }}
+                      {{ row.produceTime }}
                     </span>
                   </template>
                 </el-table-column>
                 <el-table-column label="采购日期" width="200">
                   <template slot-scope="{ row }">
                     <span v-if="row.dateType === 1">
-                      {{ row.procurementtime }}
+                      {{ row.procureTime }}
                     </span>
                   </template>
                 </el-table-column>
@@ -371,13 +371,20 @@
                   <template slot-scope="{ row, $index }">
                     <template v-if="!row.isUnpack">
                       {{ row.measurementUnit }}{{ row.unit }}/{{
-                        row.minPackUnit
+                        row.minUnit
                       }}</template
                     >
                   </template>
                 </el-table-column>
-                <el-table-column label="包装编码" prop="num"></el-table-column>
-                <el-table-column label="货位" prop="num" show-overflow-tooltip>
+                <el-table-column
+                  label="包装编码"
+                  prop="packageNo"
+                ></el-table-column>
+                <el-table-column
+                  label="货位"
+                  prop="pathName"
+                  show-overflow-tooltip
+                >
                 </el-table-column>
                 <el-table-column label="转消耗" prop="">
                   <template slot-scope="{ row }">
@@ -793,18 +800,18 @@
             // delete newObj.inOutAddPO.extInfo;
             console.log('2222', obj);
 
-            // const res = await outin.addInOut(newObj);
-            // if (res.code == 0) {
-            //   this.$message.success('保存成功!');
-            // }
+            const res = await outin.save(obj);
+            if (res.code == 0) {
+              this.$message.success('保存成功!');
+            }
 
             this.saveLoading = false;
-            // this.$router.push('/warehouseManagement/outgoingManagement');
+            this.$router.push('/warehouseManagement/outgoingManagement');
 
-            // if (res?.success) {
-            //   this.$message.success('保存成功!');
-            //   this.$router.go(-1);
-            // }
+            if (res?.success) {
+              this.$message.success('保存成功!');
+              this.$router.go(-1);
+            }
           }
         });
       },
@@ -855,10 +862,12 @@
             // warehouseName: '', //仓库名称
             assetType: this.formData.extInfo.assetType,
             outInNum: '',
-
+            assetCode: next.code,
+            assetName: next.name,
             bizStatus: 2
           };
         });
+        console.log('sasasasa===>>>', this.warehousingMaterialList);
       },
       async initData() {
         const { data } = await getTreeByPid(0);

+ 14 - 10
src/views/warehouseManagement/outgoingManagement/components/detailSelect.vue

@@ -40,7 +40,11 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="时间类型">
-            <el-select v-model="formData.dateType" placeholder="">
+            <el-select
+              v-model="formData.dateType"
+              placeholder=""
+              @change="$forceUpdate()"
+            >
               <el-option label="生产日期" :value="1"> </el-option>
               <el-option label="采购日期" :value="2"> </el-option>
             </el-select>
@@ -118,27 +122,27 @@
       <el-table-column label="序号" type="index"></el-table-column>
       <el-table-column
         label="货位"
-        prop="cargoSpaceCode"
+        prop="pathName"
         show-overflow-tooltip
         width="100"
       >
       </el-table-column>
       <el-table-column
         :label="`${title}编码`"
-        prop="onlyCode"
+        prop="sourceBizNo"
       ></el-table-column>
       <el-table-column label="批次号" prop="batchNum"> </el-table-column>
       <el-table-column label="生产日期" width="180">
         <template slot-scope="{ row }">
           <span v-if="row.dateType === 2">
-            {{ row.manufactureTime }}
+            {{ row.produceTime }}
           </span>
         </template>
       </el-table-column>
       <el-table-column label="采购日期" width="180">
         <template slot-scope="{ row }">
           <span v-if="row.dateType === 1">
-            {{ row.procurementTime }}
+            {{ row.procureTime }}
           </span>
         </template>
       </el-table-column>
@@ -149,10 +153,10 @@
         v-if="!infoData.isUnpack"
       >
         <template slot-scope="{ row }">
-          {{ row.measurementUnit }}{{ row.unit }}/{{ row.minPackUnit }}
+          {{ row.measurementUnit }}{{ row.unit }}/{{ row.minUnit }}
         </template>
       </el-table-column>
-      <el-table-column label="包装编码" prop="num"></el-table-column>
+      <el-table-column label="包装编码" prop="packageNo"></el-table-column>
       <el-table-column label="入库时间" prop="createTime"></el-table-column>
       <el-table-column width="50" type="selection"></el-table-column>
     </el-table>
@@ -347,12 +351,12 @@
         }
         const res = await outin.getoutDetail({
           ...this.formData,
-          ledgerId: this.infoData.id,
+          categoryId: this.infoData.id,
           pageNum: 1,
           size: 15
         });
-        console.log(res);
-        this.tableData = res.data.list;
+        console.log('11', res);
+        this.tableData = res.data;
         if (res.data.length > 0 && res.data[0].brandNum) {
           this.infoData.brandNum = res.data[0].brandNum;
         }