huang_an 1 rok temu
rodzic
commit
261ebcf398

+ 11 - 11
src/views/warehouseManagement/common.js

@@ -76,17 +76,17 @@ export const tableHeader = (selectEquiType) => {
     case 6: //'模具'
       return [
         { label: '型号', prop: 'modelType', width: '150' },
-        { label: '规格', prop: 'specification', width: '150' },
-        { label: '牌号', prop: 'brandNum', width: '50' },
-        {
-          label: '收缩系数',
-          prop: '',
-          formatter(row) {
-            if (!row?.extendField) return '';
-            const extendField = JSON.parse(row.extendField);
-            return extendField.shrinkageCoefficient;
-          }
-        }
+        { label: '规格', prop: 'specification', width: '150' }
+        // { label: '牌号', prop: 'brandNum', width: '50' },
+        // {
+        //   label: '收缩系数',
+        //   prop: '',
+        //   formatter(row) {
+        //     if (!row?.extendField) return '';
+        //     const extendField = JSON.parse(row.extendField);
+        //     return extendField.shrinkageCoefficient;
+        //   }
+        // }
       ];
     case 7: //'备品备件'
       return [

+ 1 - 0
src/views/warehouseManagement/components/AssetsDialog.vue

@@ -531,6 +531,7 @@
           });
           console.log('===', this.tableData);
         } else {
+          params.type = 1;
           res = await outin.getRealTimeInventory(params);
           this.tableData = res.list.map((item) => {
             return { ...item, oid: item.id, assetCode: item.code };

+ 7 - 7
src/views/warehouseManagement/sparePartsOutbound/add.vue

@@ -276,10 +276,15 @@
                     <template v-else>{{ row[item.prop] }}</template>
                   </template>
                 </el-table-column>
-                <el-table-column
+                <el-table-column label="用途" prop="purpose" width="200">
+                  <template slot-scope="{ row }">
+                    <el-input placeholder="请输入" v-model="row.purpose" />
+                  </template>
+                </el-table-column>
+                <!-- <el-table-column
                   label="批号"
                   prop="manualBatchNo"
-                ></el-table-column>
+                ></el-table-column> -->
                 <el-table-column
                   v-if="clientEnvironmentId != 2"
                   label="批次号"
@@ -310,11 +315,6 @@
                   label="重量单位"
                   prop="weightUnit"
                 ></el-table-column>
-                <el-table-column label="用途" prop="purpose" width="200">
-                  <template slot-scope="{ row }">
-                    <el-input placeholder="请输入" v-model="row.purpose" />
-                  </template>
-                </el-table-column>
                 <el-table-column
                   label="仓库"
                   width="300"

+ 3 - 3
src/views/warehouseManagement/sparePartsOutbound/details.vue

@@ -152,11 +152,12 @@
                     <template v-else>{{ row[item.prop] }}</template>
                   </template>
                 </el-table-column>
-                <el-table-column
+                <el-table-column label="用途" prop="purpose"></el-table-column>
+                <!-- <el-table-column
                   label="批号"
                   prop="manualBatchNo"
                   width="100"
-                ></el-table-column>
+                ></el-table-column> -->
                 <el-table-column
                   v-if="clientEnvironmentId != 2"
                   label="批次号"
@@ -192,7 +193,6 @@
                     {{ row.price ? row.price : '-' }}元/{{ row.measuringUnit }}
                   </template>
                 </el-table-column>
-                <el-table-column label="用途" prop="purpose"></el-table-column>
                 <el-table-column
                   label="金额"
                   prop="totalMoney"

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

@@ -196,7 +196,7 @@
         switch (this.selectedDime) {
           // 物品维度
           case '1':
-            let arr = [
+            arr = [
               {
                 columnKey: 'index',
                 type: 'index',
@@ -286,12 +286,6 @@
                 showOverflowTooltip: true,
                 width: 100
               },
-              {
-                prop: 'paths',
-                width: 230,
-                label: '仓库',
-                showOverflowTooltip: true
-              },
               {
                 columnKey: 'action',
                 label: '操作',
@@ -433,6 +427,12 @@
                 showOverflowTooltip: true,
                 width: 100
               },
+              {
+                prop: 'paths',
+                label: '仓库',
+                width: 230,
+                showOverflowTooltip: true
+              },
               {
                 columnKey: 'action',
                 label: '操作',
@@ -829,7 +829,6 @@
             let item = res.list.map((item) => {
               return {
                 ...item,
-                paths: item.pathName.split(',')[0],
                 qualityResult:
                   typeof item.qualityResult != 'number'
                     ? 3
@@ -842,7 +841,7 @@
           });
           return result;
         } else if (this.selectedDime == 2) {
-          // 物品维度
+          // 批次维度
           const params = {
             categoryLevelId: treeId,
             ...where,
@@ -859,6 +858,7 @@
             let item = res.list.map((item) => {
               return {
                 ...item,
+                paths: item.pathName.split(',')[0],
                 minUnit: item.packingUnit,
                 qualityResult:
                   typeof item.qualityResult != 'number'

+ 1 - 1
src/views/warehouseManagement/stockManagement/add_export.vue

@@ -983,7 +983,7 @@
         });
         let functionType = {};
         xlsxData.map((item) => {
-          functionType[item['sap物料码']] = item['用处'];
+          functionType[item['sap物料码']] = item['采购原因'];
         });
         console.log(functionType);
         this.formData.extInfo.assetType = '6'; //备品备件