huang_an 2 лет назад
Родитель
Сommit
e08ad551a4
2 измененных файлов с 16 добавлено и 8 удалено
  1. 15 7
      src/utils/dict/warehouse.js
  2. 1 1
      vue.config.js

+ 15 - 7
src/utils/dict/warehouse.js

@@ -32,19 +32,27 @@ export const warehousingType = [
 //   { label: '备品备件', type: '4', code: 'BEIPINBEIJIAN' }
 // ]
 export const sceneState = [
-  { code: 1, label: '生产入库' },
-  { code: 2, label: '采购入库' },
-  { code: 3, label: '归还入库' },
+  { code: 1, label: '生产入库', documentsName: '生产工单' },
+  { code: 2, label: '采购入库', documentsName: '采购收货单' },
+  { code: 3, label: '归还入库', documentsName: '出库单' },
   { code: 4, label: '领料退货入库' },
-  { code: 6, label: '销售退货入库' },
-  { code: 5, label: '其他入库' }
+  { code: 5, label: '其他入库' },
+  { code: 6, label: '销售退货入库', documentsName: '销售订单' },
+  { code: 7, label: '销售受托入库', documentsName: '受托收货单' },
+  { code: 8, label: '半成品入库', documentsName: '委外工单' },
+  { code: 9, label: '外协入库' },
+  { code: 10, label: '委外入库' },
+  { code: 11, label: '委外退货入库' }
 ];
 export const outputSceneState = [
-  { code: 1, label: '退货出库' },
+  { code: 1, label: '退出库' },
   { code: 2, label: '调拨出库' },
   { code: 3, label: '销售出库' },
   { code: 4, label: '领用出库' },
-  { code: 5, label: '报废出库' }
+  { code: 5, label: '报废出库' },
+  { code: 6, label: '外协出库' },
+  { code: 7, label: '委外出库' },
+  { code: 8, label: '受托退货出库' }
 ];
 // 紧急状态
 export const emergencyState = [

+ 1 - 1
vue.config.js

@@ -34,7 +34,7 @@ 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.119:18086',
+        target: 'http://192.168.1.116:18086',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''