修改

src/utils/dict/warehouse.js

@@ -53,14 +53,14 @@ export const outputSceneState = [
   { code: 1, label: '退供出库' },
   { code: 2, label: '调拨出库' },
   { code: 3, label: '销售出库' },
-  { code: 4, label: '领用出库' },
+  // { code: 4, label: '领用出库' },
   { code: 5, label: '报废出库' },
   { code: 6, label: '外协出库' },
   { code: 7, label: '委外出库' },
   { code: 8, label: '受托退货出库' },
   { code: 9, label: '仓库委外出库' },
   { code: 10, label: '采购退货出库' },
-  { code: 11, label: '自选领用出库' },
+  // { code: 11, label: '自选领用出库' },
   { code: 12, label: '配料出库' }
 ];
 // 紧急状态

src/views/warehouseManagement/inventoryAllocation/index.vue

@@ -14,6 +14,12 @@
             >新建</el-button
           >
         </template>
+        <!-- 单号链接 -->
+        <template v-slot:allotCode="{ row }">
+          <el-link type="primary" @click="goDetail(row)">
+            {{ row.allotCode }}
+          </el-link>
+        </template>
         <template v-slot:action="{ row }">
           <el-link
             v-if="row.status == 0 && row.type == 2"
@@ -33,14 +39,14 @@
           >
             修改
           </el-link>
-          <el-link
+          <!-- <el-link
             type="primary"
             :underline="false"
             icon="el-icon-view"
             @click="goDetail(row)"
           >
             详情
-          </el-link>
+          </el-link> -->
           <el-link
             v-if="row.status == 0"
             type="primary"
@@ -93,6 +99,7 @@
             minWidth: 110
           },
           {
+            slot: 'allotCode',
             prop: 'allotCode',
             label: '调拨单号',
             align: 'center',

src/views/warehouseManagement/outgoingManagement/add.vue

@@ -195,27 +195,39 @@
               >
               </el-table-column>
               <el-table-column
-                label="最小包装单元"
+                label="包装数量"
+                v-if="clientEnvironmentId == 3"
+                prop="packingQuantity"
                 align="center"
-                width="120"
-                prop="minPackingQuantity"
               >
                 <template slot-scope="{ row, $index }">
-                  {{ row.minPackingQuantity }} {{ row.measureUnit }} /{{
-                    row.packingUnit
-                  }}
+                  {{ row.packingQuantity }} {{ row.packingUnit }}
                 </template>
               </el-table-column>
-
               <el-table-column
+                v-else
                 label="包装数量"
                 prop="packingQuantity"
+                width="80"
+              ></el-table-column>
+              <el-table-column
+                v-if="clientEnvironmentId == 3"
+                label="最小包装单元"
                 align="center"
+                width="120"
+                prop="minPackingQuantity"
               >
                 <template slot-scope="{ row, $index }">
-                  {{ row.packingQuantity }} {{ row.packingUnit }}
+                  {{ row.minPackingQuantity }} {{ row.measureUnit }} /{{
+                    row.packingUnit
+                  }}
                 </template>
               </el-table-column>
+              <el-table-column
+                v-else
+                label="包装单位"
+                prop="packingUnit"
+              ></el-table-column>
               <el-table-column
                 label="计量数量"
                 prop="measureQuantity"

src/views/warehouseManagement/outgoingManagement/details.vue

@@ -169,17 +169,38 @@
             </el-table-column>
             <el-table-column
               label="包装数量"
+              v-if="clientEnvironmentId == 3"
               prop="packingQuantity"
               align="center"
             >
+              <template slot-scope="{ row, $index }">
+                {{ row.packingQuantity }} {{ row.packingUnit }}
+              </template>
             </el-table-column>
             <el-table-column
-              label="包装单位"
+              v-else
+              label="包装数量"
+              prop="packingQuantity"
+              width="80"
+            ></el-table-column>
+            <el-table-column
+              v-if="clientEnvironmentId == 3"
+              label="最小包装单元"
               align="center"
               width="120"
-              prop="packingUnit"
+              prop="minPackingQuantity"
             >
+              <template slot-scope="{ row, $index }">
+                {{ row.minPackingQuantity }} {{ row.measureUnit }} /{{
+                  row.packingUnit
+                }}
+              </template>
             </el-table-column>
+            <el-table-column
+              v-else
+              label="包装单位"
+              prop="packingUnit"
+            ></el-table-column>
             <el-table-column
               label="计量数量"
               prop="measureQuantity"

src/views/warehouseManagement/outgoingManagement/index.vue

@@ -183,7 +183,7 @@
         </template>
         <!-- 单号链接 -->
         <template v-slot:bizNo="{ row }">
-          <el-link @click="details(row)">
+          <el-link type="primary" @click="details(row)">
             {{ row.bizNo }}
           </el-link>
         </template>
@@ -234,14 +234,14 @@
           >
             修改
           </el-link>
-          <el-link
+          <!-- <el-link
             type="primary"
             :underline="false"
             icon="el-icon-view"
             @click="details(row)"
           >
             详情
-          </el-link>
+          </el-link> -->
           <el-link
             type="primary"
             v-if="row.verifyStatus == 0 || row.verifyStatus == 3"

src/views/warehouseManagement/picking/index.vue

@@ -20,7 +20,7 @@
           }}</el-link>
         </template> -->
         <template v-slot:outInNo="{ row }">
-          <el-link @click="details(row.outInNo)">
+          <el-link type="primary" @click="details(row.outInNo)">
             {{ row.outInNo }}
           </el-link>
         </template>

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

@@ -42,6 +42,12 @@
           调拨
         </el-button> -->
       </template>
+      <!-- 物品名称 -->
+      <template v-slot:categoryName="{ row }">
+        <el-link type="primary" @click="details(row)">
+          {{ row.categoryName }}
+        </el-link>
+      </template>
       <!-- 批次号 -->
       <template v-slot:batchNo="{ row }">
         <el-popover placement="right-start" width="800" trigger="hover">
@@ -128,17 +134,6 @@
         <span v-else-if="row.qualityResult == 3">让步接收</span>
         <span v-else>-</span>
       </template>
-      <!-- 操作列 -->
-      <template v-slot:action="{ row }">
-        <el-link
-          type="primary"
-          :underline="false"
-          icon="el-icon-edit"
-          @click="details(row)"
-        >
-          详情
-        </el-link>
-      </template>
     </ele-pro-table>
     <print :openBarCode.sync="openWindows" :config="config"></print>
     <!-- <print ref="printRef" :dimension="selectedDime"></print> -->
@@ -229,10 +224,12 @@
             showOverflowTooltip: true
           },
           {
+            slot: 'categoryName',
             prop: 'categoryName',
             label: '物品名称',
             align: 'center',
-            showOverflowTooltip: true
+            showOverflowTooltip: true,
+            minWidth: 200
           },
           this.selectedDime == 3
             ? {
@@ -393,16 +390,7 @@
                 label: '物料代号',
                 showOverflowTooltip: true
               }
-            : '',
-          {
-            columnKey: 'action',
-            label: '操作',
-            width: 100,
-            align: 'left',
-            resizable: false,
-            slot: 'action',
-            fixed: 'right'
-          }
+            : ''
         ];
         if (this.selectedDime == 1) {
           return arr.filter((item) => item != '').concat(this.newColumns);

src/views/warehouseManagement/stockManagement/add.vue

@@ -2704,7 +2704,9 @@
               ? packingBoolen
                 ? filterArr[0].conversionUnit
                 : measureBoolen
-                ? row.packingSpecificationOption[1].conversionUnit
+                ? row.packingSpecificationOption[1]
+                  ? row.packingSpecificationOption[1].conversionUnit
+                  : row.packingSpecificationOption[0].conversionUnit
                 : row.measureUnit
               : packingBoolen
               ? filterArr[0].conversionUnit
@@ -2713,12 +2715,16 @@
               ? packingBoolen
                 ? measureQuantity
                 : measureBoolen
-                ? row.packingSpecificationOption[1].packageCell
+                ? row.packingSpecificationOption[1]
+                  ? row.packingSpecificationOption[1].packageCell
+                  : row.packingSpecificationOption[0].packageCell
                 : measureQuantity
               : measureQuantity, // 计量数量
             measureUnit: row.isUnpack
               ? measureBoolen
-                ? row.packingSpecificationOption[1].packageUnit
+                ? row.packingSpecificationOption[1]
+                  ? row.packingSpecificationOption[1].packageUnit
+                  : row.packingSpecificationOption[0].packageUnit
                 : row.measureUnit
               : row.measureUnit, // 计量单位
             weight: 0, // 重量

src/views/warehouseManagement/stockManagement/add_3.vue

@@ -2574,6 +2574,7 @@
         console.log('计量单位----', row.measureUnit);
         console.log('包装数量----', row.packingQuantity);
         console.log('包装编码----', packingCodeList);
+        console.log('包装数据----', row);
         let packingList = [];
         let obj = this.getNowDate();
         let productionDate = '';
@@ -2703,7 +2704,9 @@
               ? packingBoolen
                 ? filterArr[0].conversionUnit
                 : measureBoolen
-                ? row.packingSpecificationOption[1].conversionUnit
+                ? row.packingSpecificationOption[1]
+                  ? row.packingSpecificationOption[1].conversionUnit
+                  : row.packingSpecificationOption[0].conversionUnit
                 : row.measureUnit
               : packingBoolen
               ? filterArr[0].conversionUnit
@@ -2712,12 +2715,16 @@
               ? packingBoolen
                 ? measureQuantity
                 : measureBoolen
-                ? row.packingSpecificationOption[1].packageCell
+                ? row.packingSpecificationOption[1]
+                  ? row.packingSpecificationOption[1].packageCell
+                  : row.packingSpecificationOption[0].packageCell
                 : measureQuantity
               : measureQuantity, // 计量数量
             measureUnit: row.isUnpack
               ? measureBoolen
-                ? row.packingSpecificationOption[1].packageUnit
+                ? row.packingSpecificationOption[1]
+                  ? row.packingSpecificationOption[1].packageUnit
+                  : row.packingSpecificationOption[0].packageUnit
                 : row.measureUnit
               : row.measureUnit, // 计量单位
             weight: 0, // 重量

src/views/warehouseManagement/stockManagement/details.vue

@@ -166,17 +166,38 @@
 
             <el-table-column
               label="包装数量"
+              v-if="clientEnvironmentId == 3"
               prop="packingQuantity"
               align="center"
             >
+              <template slot-scope="{ row, $index }">
+                {{ row.packingQuantity }} {{ row.packingUnit }}
+              </template>
             </el-table-column>
             <el-table-column
-              label="包装单位"
+              v-else
+              label="包装数量"
+              prop="packingQuantity"
+              width="80"
+            ></el-table-column>
+            <el-table-column
+              v-if="clientEnvironmentId == 3"
+              label="最小包装单元"
               align="center"
               width="120"
-              prop="packingUnit"
+              prop="minPackingQuantity"
             >
+              <template slot-scope="{ row, $index }">
+                {{ row.minPackingQuantity }} {{ row.measureUnit }} /{{
+                  row.packingUnit
+                }}
+              </template>
             </el-table-column>
+            <el-table-column
+              v-else
+              label="包装单位"
+              prop="packingUnit"
+            ></el-table-column>
             <el-table-column
               label="计量数量"
               prop="measureQuantity"

src/views/warehouseManagement/stockManagement/index.vue

@@ -185,7 +185,7 @@
         </template>
         <!-- 单号链接 -->
         <template v-slot:bizNo="{ row }">
-          <el-link @click="details(row)">
+          <el-link type="primary" @click="details(row)">
             {{ row.bizNo }}
           </el-link>
         </template>

src/views/warehouseManagement/stocktaking/plan/index.vue

@@ -21,6 +21,11 @@
             新建临时计划
           </el-button>
         </template>
+        <template v-slot:code="{ row }">
+          <el-link type="primary" @click="goDetail(row)">
+            {{ row.code }}
+          </el-link>
+        </template>
         <template v-slot:action="{ row }">
           <el-link
             v-if="row.planStatus == 0"
@@ -48,14 +53,6 @@
           >
             撤回
           </el-link>
-          <el-link
-            type="primary"
-            :underline="false"
-            icon="el-icon-edit"
-            @click="goDetail(row)"
-          >
-            详情
-          </el-link>
         </template>
       </ele-pro-table>
     </el-card>
@@ -104,6 +101,7 @@
             fixed: 'left'
           },
           {
+            slot: 'code',
             prop: 'code',
             label: '计划单号',
             align: 'center',

src/views/warehouseManagement/stocktaking/reportLoss/index.vue

@@ -9,6 +9,11 @@
         :datasource="datasource"
         cache-key="systemRoleTable"
       >
+        <template v-slot:code="{ row }">
+          <el-link type="primary" @click="goDetail(row)">
+            {{ row.code }}
+          </el-link>
+        </template>
         <!-- 表头工具栏 -->
         <template v-slot:toolbar>
           <el-button
@@ -31,14 +36,6 @@
           >
             修改
           </el-link>
-          <el-link
-            type="primary"
-            :underline="false"
-            icon="el-icon-edit"
-            @click="goDetail(row)"
-          >
-            详情
-          </el-link>
         </template>
       </ele-pro-table>
     </el-card>
@@ -94,11 +91,11 @@
             fixed: 'left'
           },
           {
+            slot: 'code',
             prop: 'code',
             label: '单号',
             align: 'center',
             showOverflowTooltip: true,
-            slot: 'enable',
             minWidth: 110
           },
           {

src/views/warehouseManagement/stocktaking/work/index.vue

@@ -9,6 +9,11 @@
         :datasource="datasource"
         cache-key="systemRoleTable"
       >
+        <template v-slot:code="{ row }">
+          <el-link type="primary" @click="goDetail(row)">
+            {{ row.code }}
+          </el-link>
+        </template>
         <template v-slot:action="{ row }">
           <el-link
             v-if="row.status == 0"
@@ -19,14 +24,6 @@
           >
             报工
           </el-link>
-          <el-link
-            type="primary"
-            :underline="false"
-            icon="el-icon-edit"
-            @click="goDetail(row)"
-          >
-            详情
-          </el-link>
         </template>
       </ele-pro-table>
     </el-card>
@@ -64,11 +61,12 @@
             fixed: 'left'
           },
           {
+            slot: 'code',
             prop: 'code',
             label: '盘点单号',
             align: 'center',
             showOverflowTooltip: true,
-            minWidth: 110
+            minWidth: 200
           },
           {
             prop: 'status',

vue.config.js

@@ -34,7 +34,8 @@ module.exports = {
         // target: 'http://124.71.68.31:50001', // 测试环境
         // target: 'http://124.71.68.31:50001',
         // target: 'http://192.168.1.132:18086',
-        target: 'http://192.168.1.251:18086',
+        // target: 'http://192.168.1.251:18086',
+        target: 'http://192.168.1.116:18086',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''