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

src/api/wms/business/inputBlur.ts

@@ -66,7 +66,15 @@ export const tableFormBlurVer = async (headerItem, val, row, index, routeName, f
             filters.push({
               action: searchCondition[i].action || '==',
               column: searchCondition[i].key,
-              value: formRef.formModel[searchCondition[i].value]
+              value: formRef.formModel[
+                searchCondition[i].value
+              ]
+                ? formRef.formModel[searchCondition[i].value]
+                : detailData
+                  ? detailData[searchCondition[i].value]
+                  : row
+                    ? row[searchCondition[i].value]
+                    : ''
             })
           } else if (searchCondition[i].isTableRowValue) {
             if (searchCondition[i].required) {
@@ -807,10 +815,9 @@ export const getListByBottonInput = async (headerItem, val, row, routeName, form
     console.log(999, verificationParams)
     if (verificationParams && verificationParams.length > 0) {
       for (let i = 0; i < verificationParams.length; i++) {
-        if (verificationParams[i].key == 'code') {
+        console.log(54565, verificationParams[i].key)
-          verificationParams[i].key  = 'codes'
+        verificationParams[i].key1 = verificationParams[i].key +'s'
-        }
+        params.value[verificationParams[i].key1] = val
-        params.value[verificationParams[i].key] = val
       }
     }
     await tableFormSchemaObj.verificationPage(params.value).then(async (res) => {
@@ -828,10 +835,10 @@ export const getListByBottonInput = async (headerItem, val, row, routeName, form
         let repeatCode = []
         if (tableData.length > 0) {
           tableData.forEach((item) => {
-            const findIndex = arr1.findIndex(valItem => valItem == item[field])
+            const findIndex = arr1.findIndex(valItem => valItem == item[headerItem.field])
             if (findIndex > -1) {
               arr1.splice(findIndex, 1)
-              repeatCode.push(item[field])
+              repeatCode.push(item[headerItem.field])
             }
           })
         }

src/api/wms/productionlineitem/index.ts

@@ -69,6 +69,6 @@ export const importTemplate = () => {
 }
 
 
-export const getProductionLineCodelistByCodes = (data) => {
+export const getProductionLineCodelistByCodes = async (params) => {
-  return request.get({ url: `/wms/productionlineitem/listByCodes?productionLineCode=`+data.productionLineCode +'&itemCodes='+data.itemCodes})
+  return await request.get({ url: `/wms/productionlineitem/listByCodes`, params })
 }

src/components/TableFormCountPlan/src/TableFormCountPlan.vue

@@ -66,16 +66,18 @@
               row.type == 'LOCATION_CODE'
             "
           >
-            <el-input
+          <div class="input-box">
+ <el-input
               :key="'值input' + $index"
               v-model="row.value"
               :placeholder="tableFields[1].placeholder || '请输入' + tableFields[1].label"
               :disabled = "row.disabled || false"
-              style="flex: 1"
             />
             <el-button :key="'值button' + $index" @click="inpuFocus(tableFields[1], row)"
               ><Icon icon="ep:search" size="14"
             /></el-button>
+          </div>
+           
           </el-form-item>
           <el-form-item
             :key="'值formitem' + $index"
@@ -262,4 +264,12 @@ defineExpose({
     }
   }
 }
+.input-box{
+  display: flex;
+  flex: 1!important;
+}
+.input-box ::v-deep .el-input{
+  flex: 1!important;
+  width: 0px!important;
+}
 </style>

src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts

@@ -191,7 +191,7 @@ export const Customeritem = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         inactiveValue: 'FALSE',
         activeValue: 'TRUE',
-        disabled: true
+        // disabled: true
       }
     },
     isSearch: true

src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts

@@ -27,6 +27,26 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    isSearch: true,
+    table: {
+      width: 120
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
   {
     label: '描述1',
     field: 'desc1',
@@ -50,9 +70,9 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     dictType: DICT_TYPE.ITEM_STATUS,
     dictClass: 'string',
-    isForm: true,
+    isForm: false,
-    isSearch: true,
+    isSearch: false,
-    isTable: true,
+    isTable: false,
     table: {
       width: 100
     } ,
@@ -346,25 +366,6 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
-    label: '是否可用',
-    field: 'available',
-    sort: 'custom',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
-    table: {
-      width: 120
-    },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
-      }
-    },
-  },
   {
     label: '生效时间',
     field: 'activeTime',

src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts

@@ -491,10 +491,14 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       searchAllSchemas: Balance.allSchemas,
       searchPage: BalanceApi.getBalanceItemPage,
       searchCondition: [{
+        message: '请填写从仓库代码！',
         key: 'warehouseCode',
         value: 'fromWarehouseCode',
-        message: '请填写从仓库代码！',
+        isFormModel:true, // filters中添加筛选的数据--取于formModel
-        isMainValue: true
+        required:true, // 前置添加必有，和isFormModel结合使用
+        action: '==',
+        isSearch: true,
+        isMainValue: false
       },{
         key: 'businessType',
         value: 'Scrap',
@@ -507,12 +511,6 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
         action: '==',
         isSearch: true,
         isMainValue: false
-      },{
-        key: 'inventoryStatus',
-        value: 'SCRAP',
-        action: '==',
-        isSearch: true,
-        isMainValue: false
       }]
     },
     form: {

src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts

@@ -81,7 +81,15 @@ export const IssueRequestMain = useCrudSchemas(
               value: 'TRUE',
               isMainValue: false
             }
-          ]
+          ],
+          verificationParams: [{
+            key: 'code',
+            action: '==',
+            value: '',
+            isMainValue: false,
+            isSearch: true,
+            isFormModel: true,
+          }], // 失去焦点校验参数
         }
       }
     },
@@ -95,6 +103,7 @@ export const IssueRequestMain = useCrudSchemas(
       isTable: false,
       hiddenInMain: true,
       tableForm: {
+        enterSearch:true,
         isInpuFocusShow: true,
         searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
@@ -113,11 +122,20 @@ export const IssueRequestMain = useCrudSchemas(
             value: 'TRUE',
             isMainValue: false
           }
-        ]
+        ],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       },
       form: {
         // labelMessage: '信息提示说明！！！',
         componentProps: {
+          enterSearch:true,
           isSearchList: true, // 开启查询弹窗
           searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
           searchField: 'code', // 查询弹窗赋值字段
@@ -136,7 +154,15 @@ export const IssueRequestMain = useCrudSchemas(
               value: 'TRUE',
               isMainValue: false
             }
-          ]
+          ],
+          verificationParams: [{
+            key: 'code',
+            action: '==',
+            value: '',
+            isMainValue: false,
+            isSearch: true,
+            isFormModel: true,
+          }], // 失去焦点校验参数
         }
       }
     },
@@ -168,7 +194,15 @@ export const IssueRequestMain = useCrudSchemas(
             value: 'TRUE',
             isMainValue: false
           }
-        ]
+        ],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       },
       form: {
         // labelMessage: '信息提示说明！！！',
@@ -192,7 +226,15 @@ export const IssueRequestMain = useCrudSchemas(
               value: 'TRUE',
               isMainValue: false
             }
-          ]
+          ],
+          verificationParams: [{
+            key: 'code',
+            action: '==',
+            value: '',
+            isMainValue: false,
+            isSearch: true,
+            isFormModel: true,
+          }], // 失去焦点校验参数
         }
       }
     },
@@ -792,7 +834,18 @@ export const IssueRequestDetail = useCrudSchemas(
             value: 'Issue',
             isMainValue: false
           }
-        ]
+        ],
+
+        verificationPage: ItembasicApi.getItemListByCodes, // 校验数去焦点输入是否正确的方法
+        isShowTableFormSearch: true, 
+      verificationParams: [{
+        key: 'code',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
       },
       form: {
         // labelMessage: '信息提示说明！！！',

src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts

@@ -90,6 +90,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择车间代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
@@ -100,7 +101,15 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     },
   },
@@ -114,6 +123,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
@@ -129,7 +139,15 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
           value: 'workshopCode',
           message: '请选择车间信息！', // 当前置条件为空时 弹出信息提示
           isMainValue: true
-        }]
+          }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     },
     tableForm:{
@@ -579,7 +597,9 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
           value: 'productionLineCode',
           message: '请选择生产线信息！',
           isMainValue: true
-        }]
+          }],
+
+        
       }
     },
     tableForm:{
@@ -605,7 +625,17 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
         value: 'productionLineCode',
         message: '请选择生产线信息！',
         isMainValue: true
-      }]
+        }],
+      verificationPage: WorkstationApi.getWorkstationByCodes, // 校验数去焦点输入是否正确的方法
+      isShowTableFormSearch: true,
+      verificationParams: [{
+        key: 'code',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
     },
   },
   {
@@ -944,7 +974,8 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
     },
     isTable:true,
     isTableForm: true,
-    tableForm:{
+    tableForm: {
+      enterSearch:true,
       isInpuFocusShow: true,
       isSearchList: true, // 开启查询弹窗
       searchListPlaceholder: '请选择包装规格', // 输入框占位文本
@@ -961,7 +992,15 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
         value: 'itemCode',
         message: '请先选择物料代码！',
         isMainValue: true
-      }]
+        }],
+    verificationParams: [{
+      key: 'packUnit',
+      action: '==',
+      value: '',
+      isMainValue: false,
+      isSearch: true,
+      isFormModel: true,
+    }], // 失去焦点校验参数
     },
     form: {
       // labelMessage: '信息提示说明！！！',

src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts

@@ -104,6 +104,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true,
         isSearchList: true,
         searchListPlaceholder: '请选择车间',
         searchField: 'code',
@@ -114,7 +115,15 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -129,6 +138,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch:true,
         isSearchList: true,
         searchListPlaceholder: '请选择生产线',
         searchField: 'code',
@@ -144,7 +154,15 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
           value: 'workshop',
           message: '请填写车间代码！',
           isMainValue: true
-        }]
+          }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -158,6 +176,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true,
         isSearchList: true,
         searchListPlaceholder: '请选择班组',
         searchField: 'code',
@@ -168,7 +187,15 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -182,6 +209,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true,
         isSearchList: true,
         searchListPlaceholder: '请选择班次',
         searchField: 'code',
@@ -192,7 +220,15 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -651,7 +687,8 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }],
+          }],
+
       }
     },
     tableForm:{
@@ -672,7 +709,18 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
         key: 'available',
         value: 'TRUE',
         isMainValue: false
-      }],
+        }],
+
+      verificationPage: ProductionlineitemApi.getProductionLineCodelistByCodes, // 校验数去焦点输入是否正确的方法
+      isShowTableFormSearch: true,
+      verificationParams: [{
+        key: 'itemCode',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
     },
   },
   {

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts

@@ -980,6 +980,9 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     isTable: false,
     isSearch: false,
     isDetail: true,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
   },
   {
     label: '税率(%)',
@@ -1069,12 +1072,14 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     label: '财务审批时间',
     field: 'financialCreateTime',
     formatter: dateFormatter,
-    
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
     isSearch: false,
     isDetail: true,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
   },
   {
     label: '税额',
@@ -1361,9 +1366,15 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '货币',
     field: 'currency',
     sort: 'custom',
+    dictType: DICT_TYPE.CURRENCY,
+    dictClass: 'string',
     table: {
       width: 150
     },
+    tableForm:{
+      type:'Select',
+      disabled: true
+    }
   },
   {
     label: '合同价格',

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

@@ -1957,10 +1957,12 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     },
     
   },
-  
   {
     label: '货币',
     field: 'currency',
+    dictType: DICT_TYPE.CURRENCY,
+    dictClass: 'string',
+    isTableForm:true,
     table: {
       width: 150
     },
@@ -1970,6 +1972,7 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       }
     },
     tableForm:{
+      type:'Select',
       disabled: true
     }
   },

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/index.vue

@@ -4,7 +4,7 @@
     <Search class="search-box" :schema="SupplierinvoiceRequestMain.allSchemas.searchSchema" @search="searchList" @reset="resetList" >
       <template #cha>
         <div class="el-form-item__content " style="display:inline-flex;">
-          <el-input-number style="flex:0.5;margin-right:10px" v-model="staDifferencePrice" :max="endDifferencePrice" :placeholder="t('ts.最小值')"/>-<el-input-number style="flex:0.5;margin-left:10px" v-model="endDifferencePrice" :min="staDifferencePrice" :placeholder="t('ts.最大值')"/>
+          <el-input-number style="flex:0.5;margin-right:10px" v-model="staDifferencePrice" :max="endDifferencePrice?endDifferencePrice:Infinity" :placeholder="t('ts.最小值')"/>-<el-input-number style="flex:0.5;margin-left:10px" v-model="endDifferencePrice" :min="staDifferencePrice?staDifferencePrice:-Infinity" :placeholder="t('ts.最大值')"/>
         </div>
       </template>
     </Search>

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts

@@ -1960,6 +1960,9 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
   {
     label: '货币',
     field: 'currency',
+    dictType: DICT_TYPE.CURRENCY,
+    dictClass: 'string',
+    isTableForm:true,
     table: {
       width: 150
     },
@@ -1969,6 +1972,7 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       }
     },
     tableForm:{
+      type:'Select',
       disabled: true
     }
   },

src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts

@@ -188,9 +188,15 @@ export const SupplierinvoiceInvoiced = useCrudSchemas(reactive<CrudSchema[]>([
     label: '货币',
     field: 'currency',
     sort: 'custom',
+    dictType: DICT_TYPE.CURRENCY,
+    dictClass: 'string',
     table: {
       width: 150
     },
+    tableForm:{
+      type:'Select',
+      disabled: true
+    }
   },
   {
     label: '创建时间',