yusheng 10 luni în urmă
părinte
comite
4eaf5acbcb

+ 4 - 4
src/enum/dict.js

@@ -146,10 +146,10 @@ export const pricingWayList= [
 
 ]
 //来源类型
-export const relationType= {
-  1: '货确认单',
-
-}
+export const relationTypeOption = {
+  1: '货确认单',
+  2: '收货确认单'
+};
 
 //委外订单来源类型
 

+ 39 - 17
src/views/bpm/handleTask/components/saleOrder/exceptionManagement/addOrEditDialog.vue

@@ -99,7 +99,7 @@
     getById,
     update
   } from '@/api/bpm/components/saleManage/exceptionManagement.js';
-  import { relationType } from '@/enum/dict.js';
+  import { relationTypeOption } from '@/enum/dict.js';
 
   export default {
     mixins: [dictMixins],
@@ -117,15 +117,15 @@
           { label: '报损', value: 3 },
           { label: '报废', value: 4 }
         ],
-        options1: [
-          { label: '多发', value: 1 },
-          { label: '少发', value: 2 },
-          { label: '错发', value: 3 },
-          { label: '损坏', value: 4 }
-        ],
-
-        form: {},
-        columns: [
+        form: {}
+      };
+    },
+    created() {
+      this.getById(this.businessId);
+    },
+    computed: {
+      columns() {
+        return [
           {
             width: 45,
             type: 'index',
@@ -222,7 +222,7 @@
           {
             minWidth: 120,
             prop: 'clientCode',
-            label: '客户代号',
+            label: this.form.relationType == 1 ? '客户代号' : '供应商代号',
             showOverflowTooltip: true,
             align: 'center'
           },
@@ -312,19 +312,41 @@
             label: '描述',
             slot: 'describes',
             align: 'center'
+          },
+          {
+            columnKey: 'action',
+            label: '操作',
+            width: 120,
+            align: 'center',
+            resizable: false,
+            slot: 'action',
+            fixed: 'right',
+            showOverflowTooltip: true
           }
-        ]
-      };
-    },
-    created() {
-      this.getById(this.businessId);
+        ];
+      },
+      options1() {
+        return this.form.relationType == 1
+          ? [
+              { label: '多发', value: 1 },
+              { label: '少发', value: 2 },
+              { label: '错发', value: 3 },
+              { label: '损坏', value: 4 }
+            ]
+          : [
+              { label: '多收', value: 1 },
+              { label: '少收', value: 2 },
+              { label: '错收', value: 3 },
+              { label: '损坏', value: 4 }
+            ];
+      }
     },
     methods: {
       //获取订单详情
       async getById(id) {
         this.loading = true;
         let data = await getById(id);
-        data['relationTypeName'] = relationType[data.relationType];
+        data['relationTypeName'] = relationTypeOption[data.relationType];
 
         if (data) {
           this.form = data;

+ 7 - 0
src/views/bpm/outgoingManagement/add.vue

@@ -405,6 +405,13 @@
                   label="重量单位"
                   prop="weightUnit"
                 ></el-table-column>
+                <el-table-column
+                label="库存"
+                prop="stockNum"
+                align="center"
+                :show-overflow-tooltip="true"
+              >
+              </el-table-column>
                 <el-table-column
                   label="仓库"
                   width="300"

+ 7 - 1
src/views/bpm/outgoingManagement/details.vue

@@ -238,7 +238,13 @@
                 </template>
               </template>
             </el-table-column>
-
+            <el-table-column
+                label="库存"
+                prop="stockNum"
+                align="center"
+                :show-overflow-tooltip="true"
+              >
+              </el-table-column>
             <el-table-column
               label="金额"
               align="center"

+ 7 - 0
src/views/bpm/outgoingManagement/outbound.vue

@@ -128,6 +128,13 @@
               </el-table-column>
               <el-table-column label="重量单位" prop="weightUnit" align="center" :show-overflow-tooltip="true">
               </el-table-column>
+              <el-table-column
+                label="库存"
+                prop="stockNum"
+                align="center"
+                :show-overflow-tooltip="true"
+              >
+              </el-table-column>
               <el-table-column label="单价" prop="price" align="center">
                 <template slot-scope="{ row }">
                   <template>