Przeglądaj źródła

feat(warehouse): 添加删除货架接口并优化表格样式

liujt 1 miesiąc temu
rodzic
commit
ab4372430c

+ 9 - 0
src/api/warehouseManagement/warehouseDefinition.js

@@ -150,6 +150,15 @@ export default {
     if (res.data.code == 0) {
       return res.data.data;
     }
+  },
+   //删除货架
+  deleteListByAreaId: async (data) => {
+    const res = await request.delete(
+      `/wms/warehouseareagoodsshelves/delete`, data
+    );
+    if (res.data.code == 0) {
+      return res.data.data;
+    }
   },
   //根据货架查货位
   getListByGoodId: async (goodId) => {

+ 1 - 1
src/views/warehouseManagement/stockManagement/components/print-template-tr.vue

@@ -15,7 +15,7 @@
     >
       <!-- 入库单标题 -->
       <div style="text-align: center; margin-bottom: 20px;">
-        <h2 style="margin: 0; font-size: 24px; font-weight: bold;">{{ groupName }}采购入库(退厂)单</h2>
+        <h2 style="margin: 0; font-size: 24px; font-weight: bold;">{{ groupName }}采购入库单</h2>
       </div>
       
       <!-- 供应商信息 -->

+ 26 - 20
src/views/warehouseManagement/warehouseDefinition/add.vue

@@ -179,7 +179,7 @@
                   <span v-else>{{ scope.row.extInfo[0].areaLength }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="库区宽(cm)" min-width="120">
+              <el-table-column label="库区宽(cm)" min-width="120" align="center">
                 <template slot-scope="scope">
                   <el-form-item
                     :prop="
@@ -201,7 +201,7 @@
                   <span v-else>{{ scope.row.extInfo[0].areaWidth }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="库区高(cm)" min-width="120">
+              <el-table-column label="库区高(cm)" min-width="120" align="center">
                 <template slot-scope="scope">
                   <el-form-item
                     :prop="
@@ -223,7 +223,7 @@
                   <span v-else>{{ scope.row.extInfo[0].areaHigh }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="货架数量" min-width="120">
+              <el-table-column label="货架数量" min-width="100" align="center">
                 <template slot-scope="scope">
                   <el-form-item
                     :prop="
@@ -268,7 +268,7 @@
                 <span v-else>{{ scope.row.areaBarcode }}</span>
               </template>
             </el-table-column> -->
-              <el-table-column label="备注" min-width="120">
+              <el-table-column label="备注" min-width="120" align="center">
                 <template slot-scope="scope">
                   <el-form-item
                     :prop="'warehouseAreasSaveList.' + scope.$index + 'remark'"
@@ -285,7 +285,7 @@
                   <span v-else>{{ scope.row.remark }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="操作" fixed="right" width="150">
+              <el-table-column label="操作" fixed="right" width="170" align="center">
                 <template slot-scope="{ row, $index }">
                   <el-button
                     type="text"
@@ -330,8 +330,9 @@
               <el-table-column
                 label="库区编号"
                 prop="reservoirAreaCode"
+                align="center"
               ></el-table-column>
-              <el-table-column label="货架编号" prop="code" min-width="120">
+              <el-table-column label="货架编号" prop="code" min-width="120" align="center">
                 <template slot-scope="{ row, $index }">
                   <el-form-item
                     :prop="'areaGoodsshelvesList.' + $index + '.code'"
@@ -347,7 +348,7 @@
                   <span v-else>{{ row.code }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="货架行数" min-width="120">
+              <el-table-column label="货架行数" min-width="120" align="center">
                 <template slot-scope="scope">
                   <el-form-item
                     :prop="
@@ -376,7 +377,7 @@
                   <span v-else>{{ scope.row.extInfo[0].line }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="货架列数" min-width="120">
+              <el-table-column label="货架列数" min-width="120" align="center">
                 <template slot-scope="scope">
                   <el-form-item
                     :prop="
@@ -405,7 +406,7 @@
                   <span v-else>{{ scope.row.extInfo[0].column }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="货架长(cm)" min-width="120">
+              <el-table-column label="货架长(cm)" min-width="120" align="center">
                 <template slot-scope="scope">
                   <el-form-item
                     :prop="
@@ -427,7 +428,7 @@
                   <span v-else>{{ scope.row.extInfo[0].areaLength }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="货架宽(cm)" min-width="120">
+              <el-table-column label="货架宽(cm)" min-width="120" align="center">
                 <template slot-scope="scope">
                   <el-form-item
                     :prop="
@@ -449,7 +450,7 @@
                   <span v-else>{{ scope.row.extInfo[0].areaWidth }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="货架高(cm)" min-width="120">
+              <el-table-column label="货架高(cm)" min-width="120" align="center">
                 <template slot-scope="scope">
                   <el-form-item
                     :prop="
@@ -471,7 +472,7 @@
                   <span v-else>{{ scope.row.extInfo[0].areaHigh }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="货位数量" prop="" min-width="120">
+              <el-table-column label="货位数量" prop="" min-width="120" align="center">
                 <template slot-scope="{ row }">
                   {{ setNUm(row) }}
                 </template>
@@ -480,6 +481,7 @@
                 label="是否规则"
                 prop="isRegular"
                 min-width="120"
+                align="center"
               >
                 <template slot-scope="{ row }">
                   <el-select
@@ -506,7 +508,7 @@
               label="货架条码"
               prop="goodsshelvesBarcode"
             ></el-table-column> -->
-              <el-table-column label="备注" min-width="120">
+              <el-table-column label="备注" min-width="120" align="center">
                 <template slot-scope="scope">
                   <el-form-item
                     :prop="'areaGoodsshelvesList.' + scope.$index + '.remark'"
@@ -521,7 +523,7 @@
                   <span v-else>{{ scope.row.remark }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="操作" fixed="right" min-width="120">
+              <el-table-column label="操作" fixed="right" min-width="120" align="center">
                 <template slot-scope="{ $index, row }">
                   <el-button
                     type="text"
@@ -561,7 +563,7 @@
               :header-cell-style="{ background: '#EEEEEE', border: 'none' }"
             >
               <!-- <el-table-column type="selection" width="55"> </el-table-column> -->
-              <el-table-column label="货架编号" prop="goodsShelvesCode">
+              <el-table-column label="货架编号" prop="goodsShelvesCode" align="center">
                 <template slot-scope="{ row }">
                   {{ row.warehouseAreaCode + '-' + row.warehouseAreaGoodsCode }}
                 </template>
@@ -570,6 +572,7 @@
                 label="货位编号"
                 prop="goodsAllocationCode"
                 min-width="120"
+                align="center"
               >
                 <template slot-scope="{ row, $index }">
                   <el-form-item
@@ -588,7 +591,7 @@
                   <span v-else>{{ row.goodsAllocationCode }}</span>
                 </template></el-table-column
               >
-              <el-table-column label="货位长(cm)" min-width="120">
+              <el-table-column label="货位长(cm)" min-width="120" align="center">
                 <template slot-scope="scope">
                   <el-form-item
                     :prop="
@@ -615,7 +618,7 @@
                   }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="货位宽(cm)" min-width="120">
+              <el-table-column label="货位宽(cm)" min-width="120" align="center">
                 <template slot-scope="scope">
                   <el-form-item
                     :prop="
@@ -640,7 +643,7 @@
                   }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="货位高(cm)" min-width="120">
+              <el-table-column label="货位高(cm)" min-width="120" align="center">
                 <template slot-scope="scope">
                   <el-form-item
                     :prop="
@@ -665,7 +668,7 @@
                   }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="限重(kg)" min-width="120">
+              <el-table-column label="限重(kg)" min-width="120" align="center">
                 <template slot-scope="scope">
                   <!-- :rules="areaLocationRules.weightLimit"
                     :prop="
@@ -685,7 +688,7 @@
                   <span v-else>{{ scope.row.extInfo[0].weightLimit }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="基本货位容积(cm³)" min-width="120">
+              <el-table-column label="基本货位容积(cm³)" min-width="120" align="center">
                 <template slot-scope="scope">
                   <el-form-item
                     :prop="
@@ -971,6 +974,7 @@
         let kqArr = [];
         for (const key in warehouseAreasSaveList) {
           kqArr.push({
+            id: warehouseAreasSaveList[key].id,
             name: warehouseAreasSaveList[key].name,
             code: warehouseAreasSaveList[key].code,
             extInfo: [
@@ -1446,6 +1450,7 @@
         //  warehouseAreasSaveList: res.reservoirAreaList || [], //库区
         // areaGoodsshelvesList: res.goodsShelvesList || [], //货架
         // allocationReqList: res.goodsAllocationList || [] //货位
+        console.log('removeGoods1~~', idx, id, code, reservoirAreaCode);
         if (
           this.areaForm.areaGoodsshelvesList.filter(
             (item) => item.reservoirAreaCode === reservoirAreaCode
@@ -1485,6 +1490,7 @@
         });
       },
       remove1(index, { id, code }) {
+        console.log('remove1~~', index, id, code);
         this.$confirm(`是否删除这个库区`)
           .then(async () => {
             if (id) {