bug:叫料标签

.env.wyf

@@ -3,16 +3,26 @@ NODE_ENV=test
 
 VITE_DEV=false
 
-# # # 请求路径
-# VITE_BASE_URL='http://192.168.0.110:12080'
+# # 请求路径
+# VITE_BASE_URL='http://192.168.0.113:12080'
 # # 上传路径
-# VITE_UPLOAD_URL='http://192.168.0.110:12080/admin-api/infra/file/upload'
+# VITE_UPLOAD_URL='http://192.168.0.113:12080/admin-api/infra/file/upload'
+# # 请求路径
+# VITE_BASE_URL='https://scp.faway-hella.com/api'
+# # 上传路径
+# VITE_UPLOAD_URL='https://scp.faway-hella.com/api/admin-api/infra/file/upload'
 
 # 请求路径
-VITE_BASE_URL='http://dev.ccwin-in.com:25300/api'
-
+VITE_BASE_URL='http://172.21.32.13/api'
 # 上传路径
-VITE_UPLOAD_URL='http://dev.ccwin-in.com:25300/api/admin-api/infra/file/upload'
+VITE_UPLOAD_URL='http://172.21.32.13/api/admin-api/infra/file/upload'
+
+
+# # 请求路径
+# VITE_BASE_URL='http://dev.ccwin-in.com:25300/api'
+
+# # 上传路径
+# VITE_UPLOAD_URL='http://dev.ccwin-in.com:25300/api/admin-api/infra/file/upload'
 
 # 接口前缀
 VITE_API_BASEPATH=
@@ -48,7 +58,7 @@ VITE_INTERFACE_URL='http://dev.ccwin-in.com:25310/magic/web/index.html'
 VITE_JMREPORT_BASE_URL='http://192.168.0.108:12080'
 
 # 租户配置
-VITE_TENANT='["长春","成都"]'
+VITE_TENANT='["长春1379","成都1397","长春2379"]'
 
 # 查看质检报告环境
 VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400'

src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts

@@ -352,6 +352,22 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
         }]
     },
   },
+  {
+    label: '叫料库位',
+    field: 'rawLocationCode',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:1,
+    isSearch:true,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
   {
     label: '项目',
     field: 'project',
@@ -368,13 +384,13 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '库位',
-    field: 'location',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm:false,
+    // label: '库位',
+    // field: 'location',
+    // sort: 'custom',
+    // table: {
+    //   width: 150
+    // },
+    // isForm:false,
     // form: {
     //   // labelMessage: '信息提示说明！！！',
     //   componentProps: {
@@ -401,28 +417,28 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
     //     }]
     //   }
     // },
-    isSearch: true
-  },
-  {
-    label: '是否确认接收',
-    field: 'isRecive',
-    sort: 'custom',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    table: {
-      width: 150
-    },
-    isForm:false
-    // form: {
-    //   component: 'Switch',
-    //   value: 'FALSE',
-    //   componentProps: {
-    //     inactiveValue: 'FALSE',
-    //     activeValue: 'TRUE'
-    //   }
-    // }
+    // isSearch: true
   },
+  // {
+  //   label: '是否确认接收',
+  //   field: 'isRecive',
+  //   sort: 'custom',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   table: {
+  //     width: 150
+  //   },
+  //   isForm:false
+  //   // form: {
+  //   //   component: 'Switch',
+  //   //   value: 'FALSE',
+  //   //   componentProps: {
+  //   //     inactiveValue: 'FALSE',
+  //   //     activeValue: 'TRUE'
+  //   //   }
+  //   // }
+  // },
   {
     label: '创建时间',
     field: 'createTime',

src/views/wms/basicDataManage/labelManage/callmaterials/index.vue

@@ -120,6 +120,10 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
       setV['uom'] = val[0]['uom']
       setV['packUnit'] = val[0]['packUnit']
       setV['callmaterialQty'] = val[0]['packQty']
+    } else  if (formField == 'workStationCode') {
+      //工位
+      setV['rawLocationCode'] = val[0]['rawLocationCode']
+      setV[formField] = val[0][searchField]
     }else {
       setV[formField] = val[0][searchField]
     }