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

src/views/eam/itemAccounts/itemAccounts.data.ts

@@ -141,7 +141,7 @@ export const ItemAccounts = useCrudSchemas(
       label: '库区编号',
       field: 'areaNumber',
       sort: 'custom',
-      isTable: false,
+      isTable: true,
       isSearch: true,
       table: {
         width: 180

src/views/eam/sparePartsApplyMain/SparePartsApply.data.ts

@@ -230,19 +230,17 @@ export const SparePartsApplyMainRules = reactive({
 export const SparePartsApplyDetail = useCrudSchemas(
   reactive<CrudSchema[]>([
     {
-      label: '备件编号',
-      field: 'sparePartsCode',
+      label: '库位编号',
+      field: 'locationCode',
       sort: 'custom',
-      table: {
-        width: 150
-      },
+      isSearch: false,
       form: {
-        // labelMessage: '信息提示说明！！！',
         componentProps: {
           isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择备件编号', // 输入框占位文本
-          searchField: 'itemNumber', // 查询弹窗赋值字段
-          searchTitle: '备件信息', // 查询弹窗标题
+          searchListPlaceholder: '请选择库位编号', // 输入框占位文本
+          searchField: 'code', // 查询弹窗赋值字段
+          searchTitle: '库位信息', // 查询弹窗标题
+
           searchAllSchemas: ItemAccounts.allSchemas, // 查询弹窗所需类
           searchPage: ItemAccountsApi.getItemAccountsPage, // 查询弹窗所需分页方法
           searchCondition: [
@@ -259,6 +257,7 @@ export const SparePartsApplyDetail = useCrudSchemas(
         searchListPlaceholder: '请选择备件编号', // 输入框占位文本
         searchField: 'itemNumber', // 查询弹窗赋值字段
         searchTitle: '备件信息', // 查询弹窗标题
+
         searchAllSchemas: ItemAccounts.allSchemas, // 查询弹窗所需类
         searchPage: ItemAccountsApi.getItemAccountsPage, // 查询弹窗所需分页方法
         searchCondition: [
@@ -270,7 +269,36 @@ export const SparePartsApplyDetail = useCrudSchemas(
         ]
       }
     },
-
+    {
+      label: '库区编号',
+      field: 'areaCode',
+      sort: 'custom',
+      isSearch: false,
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      tableForm: {
+        disabled: true
+      }
+    },
+    {
+      label: '备件编号',
+      field: 'sparePartsCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      tableForm: {
+        disabled: true
+      }
+    },
     {
       label: '库存数量',
       field: 'currentQty',
@@ -278,7 +306,14 @@ export const SparePartsApplyDetail = useCrudSchemas(
       isSearch: false,
       tableForm: {
         disabled: true
-      }
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      isDetail: false,
+      isTable: false
     },
     {
       label: '申领数量',

src/views/eam/sparePartsApplyMain/index.vue

@@ -132,18 +132,27 @@ const updataTableColumns = (val) => {
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
   nextTick(() => {
-    nextTick(() => {
-      const setV = {}
-      setV[formField] = val[0][searchField]
-      if (formField == 'sparePartsCode') {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    console.log(11, val[0])
+    if (type == 'tableForm') {
+      if (formField == 'locationCode') {
+        row['locationCode'] = val[0].locationNumber
+        row['areaCode'] = val[0].areaNumber
         row['sparePartsCode'] = val[0].itemNumber
         row['currentQty'] = val[0].qty
+        row['isRadeIn'] = val[0].isRadeIn
       }
-      if (formField == 'equipmentCode') {
-        row['equipmentCode'] = val[0].code
+    } else {
+      if (formField == 'locationCode') {
+        setV['locationCode'] = val[0].locationNumber
+        setV['areaCode'] = val[0].areaNumber
+        setV['sparePartsCode'] = val[0].itemNumber
+        setV['currentQty'] = val[0].qty
+        setV['isRadeIn'] = val[0].isRadeIn
       }
-      formRef.setValues(setV)
-    })
+    }
+    formRef.setValues(setV)
   })
 }
 // 查询页面返回——详情

src/views/eam/sparepartsinlocation/index.vue

@@ -132,7 +132,6 @@ const updataTableColumns = (val) => {
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
-  nextTick(() => {
     nextTick(() => {
       const setV = {}
       setV[formField] = val[0][searchField]
@@ -156,7 +155,6 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
       }
       formRef.setValues(setV)
     })
-  })
 }
 // 查询页面返回——详情
 const searchTableSuccessDetail = (formField, searchField, val, formRef) => {

src/views/eam/sparepartsoutlocation/SparePartsOutLocation.data.ts

@@ -217,19 +217,17 @@ export const SparePartsOutLocationMainRules = reactive({
 export const SparePartsOutLocationDetail = useCrudSchemas(
   reactive<CrudSchema[]>([
     {
-      label: '备件编号',
-      field: 'sparePartsCode',
+      label: '库位编号',
+      field: 'locationCode',
       sort: 'custom',
-      table: {
-        width: 150
-      },
+      isSearch: false,
       form: {
-        // labelMessage: '信息提示说明！！！',
         componentProps: {
           isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择备件编号', // 输入框占位文本
-          searchField: 'itemNumber', // 查询弹窗赋值字段
-          searchTitle: '备件信息', // 查询弹窗标题
+          searchListPlaceholder: '请选择库位编号', // 输入框占位文本
+          searchField: 'code', // 查询弹窗赋值字段
+          searchTitle: '库位信息', // 查询弹窗标题
+
           searchAllSchemas: ItemAccounts.allSchemas, // 查询弹窗所需类
           searchPage: ItemAccountsApi.getItemAccountsPage, // 查询弹窗所需分页方法
           searchCondition: [
@@ -246,6 +244,7 @@ export const SparePartsOutLocationDetail = useCrudSchemas(
         searchListPlaceholder: '请选择备件编号', // 输入框占位文本
         searchField: 'itemNumber', // 查询弹窗赋值字段
         searchTitle: '备件信息', // 查询弹窗标题
+
         searchAllSchemas: ItemAccounts.allSchemas, // 查询弹窗所需类
         searchPage: ItemAccountsApi.getItemAccountsPage, // 查询弹窗所需分页方法
         searchCondition: [
@@ -257,7 +256,36 @@ export const SparePartsOutLocationDetail = useCrudSchemas(
         ]
       }
     },
-
+    {
+      label: '库区编号',
+      field: 'areaCode',
+      sort: 'custom',
+      isSearch: false,
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      tableForm: {
+        disabled: true
+      }
+    },
+    {
+      label: '备件编号',
+      field: 'sparePartsCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      tableForm: {
+        disabled: true
+      }
+    },
     {
       label: '库存数量',
       field: 'currentQty',
@@ -265,7 +293,14 @@ export const SparePartsOutLocationDetail = useCrudSchemas(
       isSearch: false,
       tableForm: {
         disabled: true
-      }
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      isDetail: false,
+      isTable: false
     },
     {
       label: '申领数量',