Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts

@@ -536,33 +536,6 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 120
     },
   },
-  {
-    label: '到库位代码',
-    field: 'toLocationCode',
-    sort: 'custom',
-    tableForm:{
-      isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择到库位代码',
-      searchField: 'code',
-      searchTitle: '库位信息',
-      searchAllSchemas: Location.allSchemas,
-      searchPage: LocationApi.selectBusinessTypeToLocation,
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择到库位代码',
-        searchField: 'code',
-        searchTitle: '库位信息',
-        searchAllSchemas: Location.allSchemas,
-        searchPage: LocationApi.selectBusinessTypeToLocation,
-      }
-    },
-    table: {
-      width: 120
-    },
-  },
   {
     label: '包装规格',
     field: 'packUnit',
@@ -574,6 +547,14 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       searchTitle: '包装规格',
       searchAllSchemas: Itempackaging.allSchemas,
       searchPage: ItempackageApi.getItempackagingPage,
+      searchCondition:[
+        {
+          key: 'itemCode',
+          value: 'downItemCode',
+          message: "请选择降级物料代码",
+          isMainValue: true
+        }
+      ]
     },
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -584,6 +565,14 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
         searchTitle: '包装规格',
         searchAllSchemas: Itempackaging.allSchemas,
         searchPage: ItempackageApi.getItempackagingPage,
+        searchCondition:[
+          {
+            key: 'itemCode',
+            value: 'downItemCode',
+            message: "请选择降级物料代码",
+            isMainValue: true
+          }
+        ]
       }
     },
     table: {

src/views/wms/inventoryManage/balance/index.vue

@@ -193,17 +193,17 @@ const handleSelectionPoint = async ()=>{
 }
 // 列表-操作按钮
 const butttondata = [
-  // {
+  {
-  //   label: '标签信息',
+    label: '标签信息',
-  //   name: 'bqxx',
+    name: 'bqxx',
-  //   hide: false,
+    hide: false,
-  //   type: 'primary',
+    type: 'primary',
-  //   icon: '',
+    icon: '',
-  //   color: '',
+    color: '',
-  //   link: true,
+    link: true,
-  //   float:'right',
+    float:'right',
-  //   hasPermi: ''
+    hasPermi: ''
-  // },
+  },
   defaultButtons.mainListPointBtn(null), // 标签打印
   // defaultButtons.mainListEditBtn({hasPermi:'wms:balance:update'}), // 编辑
   // defaultButtons.mainListDeleteBtn({hasPermi:'wms:balance:delete'}), // 删除

src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts

@@ -608,22 +608,22 @@ export const ProductputawayJobMainRules = reactive({
  * @returns {Array} 制品上架任务子表
  */
 export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
+  // {
-    label: '采购订单号',
+  //   label: '采购订单号',
-    field: 'poNumber',
+  //   field: 'poNumber',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-  },
+  // },
-  {
+  // {
-    label: '订单行',
+  //   label: '订单行',
-    field: 'poLine',
+  //   field: 'poLine',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-  },
+  // },
   {
     label: '物料代码',
     field: 'itemCode',

src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts

@@ -389,24 +389,24 @@ export const ProductputawayRecordMainRules = reactive({
  * @returns {Array} 制品上架记录子表
  */
 export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
+  // {
-    label: '采购订单号',
+  //   label: '采购订单号',
-    field: 'poNumber',
+  //   field: 'poNumber',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    sortTableDefault:2,
+  //   sortTableDefault:2,
-  },
+  // },
-  {
+  // {
-    label: '订单行',
+  //   label: '订单行',
-    field: 'poLine',
+  //   field: 'poLine',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    sortTableDefault:2,
+  //   sortTableDefault:2,
-  },
+  // },
   {
     label: '物料代码',
     field: 'itemCode',
@@ -753,4 +753,4 @@ export const ProductputawayRecordDetailRules = reactive({
   creator: [
     { required: true, message: '请输入创建者', trigger: 'blur' }
   ],
-})
+})

src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts

@@ -427,26 +427,26 @@ export const ProductputawayRequestMainRules = reactive({
  * @returns {Array} 制品上架申请子表
  */
 export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
+  // {
-    label: '采购订单号',
+  //   label: '采购订单号',
-    field: 'poNumber',
+  //   field: 'poNumber',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    isForm: false,
+  //   isForm: false,
-    isTableForm: false,
+  //   isTableForm: false,
-  },
+  // },
-  {
+  // {
-    label: '订单行',
+  //   label: '订单行',
-    field: 'poLine',
+  //   field: 'poLine',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    isForm: false,
+  //   isForm: false,
-    isTableForm: false,
+  //   isTableForm: false,
-  },
+  // },
   {
     label: '物料代码',
     field: 'itemCode',
@@ -824,4 +824,4 @@ export const ProductputawayRequestDetailRules = reactive({
   itemCode: [
     { required: true, message: '请选择物料代码', trigger: 'change' }
   ],
-})
+})