yusheng il y a 11 mois
Parent
commit
b3d8eb0467

+ 8 - 7
src/BIZComponents/inventoryTable.vue

@@ -989,6 +989,13 @@
             slot: 'pricingWay',
             align: 'center'
           },
+          {
+            minWidth: 120,
+            prop: 'goodsLevel',
+            label: '物品级别',
+            slot: 'goodsLevel',
+            align: 'center'
+          },
           {
             width: 160,
             prop: 'goodsPriceType',
@@ -1051,13 +1058,7 @@
             }
           },
 
-          {
-            minWidth: 120,
-            prop: 'goodsLevel',
-            label: '物品级别',
-            slot: 'goodsLevel',
-            align: 'center'
-          },
+   
           {
             width: 110,
             prop: 'batchNo',

+ 10 - 0
src/views/purchasingManage/purchaseOrder/components/detailDialog.vue

@@ -407,6 +407,7 @@
   import billDetailDialog from '@/views/purchasingManage/purchaseOrder/components/billDetailDialog.vue';
   import { orderSourceType, outsourceSceneList, lbjtList } from '@/enum/dict';
   import tabMixins from '@/mixins/tableColumnsMixin';
+  import { levelList } from '@/enum/dict.js';
 
   export default {
     mixins: [dictMixins,tabMixins],
@@ -694,6 +695,15 @@
                 : '';
             }
           },
+          {
+            minWidth: 120,
+            prop: 'goodsLevel',
+            label: '物品级别',
+            formatter: (_row, _column, cellValue) => {
+              return levelList.find(item=>item.value==_row.goodsLevel)?.label
+            },
+            align: 'center'
+          },
           {
             width: 160,
             prop: 'singlePrice',

+ 22 - 1
src/views/purchasingManage/purchaseOrder/components/inventoryTable.vue

@@ -283,7 +283,18 @@
           </el-input>
         </el-form-item>
       </template> -->
-
+      <template v-slot:goodsLevel="{ row, $index }">
+        <el-form-item :prop="'datasource.' + $index + '.goodsLevel'">
+          <el-select v-model="row.goodsLevel" style="width: 100%">
+            <el-option
+              :label="item.label"
+              :value="item.value"
+              v-for="(item, index) in levelList"
+              :key="index"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </template>
       <template v-slot:singleWeight="scope">
         <el-form-item
           style="margin-bottom: 20px"
@@ -488,6 +499,7 @@
   import { pricingWayList, lbjtList } from '@/enum/dict.js';
   import { getInventoryTotalAPI } from '@/api/wms';
   import tabMixins from '@/mixins/tableColumnsMixin';
+  import { levelList } from '@/enum/dict.js';
 
   const dayjs = require('dayjs');
 
@@ -538,6 +550,7 @@
         technicalDrawings: []
       };
       return {
+        levelList,
         cacheKeyUrl: 'eos-purchasingManage-purchaseOrder-inventoryTable',
         pricingWayList,
         discountTotalPrice: 0.0,
@@ -642,6 +655,13 @@
             slot: 'pricingWay',
             align: 'center'
           },
+          {
+            minWidth: 120,
+            prop: 'goodsLevel',
+            label: '物品级别',
+            slot: 'goodsLevel',
+            align: 'center'
+          },
           {
             width: 160,
             prop: 'singlePrice',
@@ -1172,6 +1192,7 @@
           this.$set(parasm, 'approvalNumber', item.extField?.approvalNumber);
           this.$set(parasm, 'singleWeight', item.roughWeight);
           this.$set(parasm, 'pricingWay', item.pricingWay || 1);
+          this.$set(parasm, 'goodsLevel', item.level);
 
           this.$set(
             parasm,

+ 10 - 0
src/views/purchasingManage/purchaseOrder/invoice/components/detailDialog.vue

@@ -166,6 +166,7 @@
   import innerBoundDetails from '@/BIZComponents/innerdetails.vue';
   // import fileMain from '@/components/addDoc/index.vue';
   import tabMixins from '@/mixins/tableColumnsMixin';
+  import { levelList } from '@/enum/dict.js';
 
   export default {
     mixins: [dictMixins, tabMixins],
@@ -386,6 +387,15 @@
                   : '';
               }
             },
+            {
+            minWidth: 120,
+            prop: 'goodsLevel',
+            label: '物品级别',
+            formatter: (_row, _column, cellValue) => {
+              return levelList.find(item=>item.value==_row.goodsLevel)?.label
+            },
+            align: 'center'
+          },
             {
               width: 160,
               prop: 'singlePrice',

+ 11 - 0
src/views/purchasingManage/purchaseOrder/invoice/components/inventoryTable.vue

@@ -277,6 +277,7 @@
   import { parameterGetByCode } from '@/api/main/index.js';
   import tabMixins from '@/mixins/tableColumnsMixin';
   import productListMain from '@/BIZComponents/product-list.vue';
+  import { levelList } from '@/enum/dict.js';
 
   export default {
     mixins: [dictMixins, tabMixins],
@@ -537,6 +538,15 @@
             slot: 'singlePrice',
             align: 'center'
           },
+          {
+            minWidth: 120,
+            prop: 'goodsLevel',
+            label: '物品级别',
+            formatter: (_row, _column, cellValue) => {
+              return levelList.find(item=>item.value==_row.goodsLevel)?.label
+            },
+            align: 'center'
+          },
           {
             width: 120,
             prop: 'taxRate',
@@ -867,6 +877,7 @@
           this.$set(parasm, 'discountSinglePrice', 0);
           this.$set(parasm, 'sendTotalWeight', 0);
           this.$set(parasm, 'increaseTotalWeight', 0);
+          this.$set(parasm, 'goodsLevel', item.level);
 
           this.$set(
             parasm,

+ 10 - 0
src/views/purchasingManage/purchaseOrder/outSourceSend/components/detailDialog.vue

@@ -144,6 +144,7 @@
   // import fileMain from '@/components/addDoc/index.vue';
   import outBoundDetails from '@/BIZComponents/outdetails.vue';
   import tabMixins from '@/mixins/tableColumnsMixin';
+  import { levelList } from '@/enum/dict.js';
 
   export default {
     mixins: [dictMixins,tabMixins],
@@ -336,6 +337,15 @@
                 : '';
             }
           },
+          {
+            minWidth: 120,
+            prop: 'goodsLevel',
+            label: '物品级别',
+            formatter: (_row, _column, cellValue) => {
+              return levelList.find(item=>item.value==_row.goodsLevel)?.label
+            },
+            align: 'center'
+          },
           {
             width: 120,
             prop: 'taxRate',

+ 11 - 0
src/views/purchasingManage/purchaseOrder/outSourceSend/components/inventoryTable.vue

@@ -216,6 +216,8 @@
   // import fileMain from '@/components/addDoc/index.vue';
   import { getCode } from '@/components/addDoc/api/index.js';
   import { lbjtList } from '@/enum/dict.js';
+  import { levelList } from '@/enum/dict.js';
+
   export default {
     mixins: [dictMixins,tabMixins],
     props: {
@@ -435,6 +437,15 @@
                 : '';
             }
           },
+          {
+            minWidth: 120,
+            prop: 'goodsLevel',
+            label: '物品级别',
+            formatter: (_row, _column, cellValue) => {
+              return levelList.find(item=>item.value==_row.goodsLevel)?.label
+            },
+            align: 'center'
+          },
           {
             width: 190,
             prop: 'singlePrice',

+ 10 - 0
src/views/purchasingManage/purchaseOrder/returnGoods/components/detailDialog.vue

@@ -187,6 +187,7 @@
   import { getFile } from '@/api/system/file';
   import dictMixins from '@/mixins/dictMixins';
   import tabMixins from '@/mixins/tableColumnsMixin';
+  import { levelList } from '@/enum/dict.js';
 
   import { reviewStatusEnum } from '@/enum/dict';
   import { copyObj } from '@/utils/util';
@@ -352,6 +353,15 @@
                 : '';
             }
           },
+          {
+            minWidth: 120,
+            prop: 'goodsLevel',
+            label: '物品级别',
+            formatter: (_row, _column, cellValue) => {
+              return levelList.find(item=>item.value==_row.goodsLevel)?.label
+            },
+            align: 'center'
+          },
           {
             width: 160,
             prop: 'singlePrice',

+ 14 - 4
src/views/purchasingManage/purchaseOrder/returnGoods/components/inventoryTable.vue

@@ -23,11 +23,10 @@
           </el-button>
           <div class="pricebox">
             <span class="amount">总金额:{{ totalAmount }}元</span>
-        
           </div>
         </div>
       </template>
-    
+
       <template v-slot:returnReason="{ row, $index }">
         <el-form-item
           style="margin-bottom: 20px"
@@ -247,9 +246,10 @@
   import innertboundDetailsDialog from './innerboundDetailsDialog.vue';
   import { lbjtList } from '@/enum/dict.js';
   import tabMixins from '@/mixins/tableColumnsMixin';
+  import { levelList } from '@/enum/dict.js';
 
   export default {
-    mixins: [dictMixins,tabMixins],
+    mixins: [dictMixins, tabMixins],
     props: {
       receiveId: String,
       payAmount: [Number, String],
@@ -275,7 +275,7 @@
         technicalDrawings: []
       };
       return {
-        cacheKeyUrl:'eos-purchaseOrder-returnorder-inventoryTable',
+        cacheKeyUrl: 'eos-purchaseOrder-returnorder-inventoryTable',
         discountTotalPrice: 0.0,
         allPrice: 0.0,
         totalAmount: 0.0,
@@ -470,6 +470,16 @@
                 : '';
             }
           },
+          {
+            minWidth: 120,
+            prop: 'goodsLevel',
+            label: '物品级别',
+            formatter: (_row, _column, cellValue) => {
+              return levelList.find((item) => item.value == _row.goodsLevel)
+                ?.label;
+            },
+            align: 'center'
+          },
           {
             width: 160,
             prop: 'singlePrice',

+ 4 - 0
vue.config.js

@@ -28,6 +28,10 @@ module.exports = {
     }
   },
   devServer: {
+    headers: {			
+      // 允许跨域访问子应用页面
+      'Access-Control-Allow-Origin': '*',
+    },
     // 代理跨域的配置
     proxy: {
       // 当我们的本地的请求 有/api的时候,就会代理我们的请求地址向另外一个服务器发出请求