From 990323c5dc1df5a99c96f9b379355d85fa9ab50e Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 17 Oct 2024 11:37:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E8=A3=85=E5=8F=B7=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/business/inputBlur.ts             |  1 -
 src/components/BasicForm/src/BasicForm.vue    | 52 ++++++++++++++++++-
 src/components/Detail/src/Detail.vue          | 15 +++++-
 .../src/ImportCustomerStatementForm.vue       |  1 -
 .../src/ImportCustomerStatementShareForm.vue  |  1 -
 src/components/ImportForm/src/ImportForm.vue  |  1 -
 src/components/Search/src/Search.vue          |  5 ++
 src/components/SearchHigh/src/SearchHigh.vue  |  7 +++
 src/components/Table/src/Table.vue            | 15 +++++-
 src/views/eam/locationArea/index.vue          |  1 -
 src/views/login/components/LoginForm.vue      |  5 ++
 src/views/qms/inspectionRecord/addForm.vue    |  7 ---
 .../qms/inspectionRecordFirst/addForm.vue     |  3 --
 .../labelManage/purchasePackage/index.vue     |  2 -
 .../issue/issueRequestMain/index.vue          |  1 +
 .../productscrapRequestMain/index.vue         |  1 -
 .../supplierdeliverRequestMain/index.vue      |  1 -
 17 files changed, 95 insertions(+), 24 deletions(-)

diff --git a/src/api/wms/business/inputBlur.ts b/src/api/wms/business/inputBlur.ts
index 2ae9504a0..3a107026d 100644
--- a/src/api/wms/business/inputBlur.ts
+++ b/src/api/wms/business/inputBlur.ts
@@ -475,7 +475,6 @@ export const FormBlur = async (field, val, routeName, formRef, detailData, formS
 // 根据下方输入框失去焦点校验信息
 export const getListByBottonInput = async (headerItem, val, row, routeName, formRef, detailData, tableData, callback) => {
   const tableFormSchemaObj = headerItem?.tableForm
-  console.log(333, tableFormSchemaObj)
   if (tableFormSchemaObj.verificationPage && tableFormSchemaObj.verificationParams) {
     if (!val) return;
     const params = ref({})
diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index cd429fc71..e51eeca17 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -164,6 +164,7 @@
   </SearchTable>
 </template>
 <script setup lang="ts">
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { SearchTable } from '@/components/SearchTable'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import ButtonBase from '@/components/XButton/src/ButtonBase.vue'
@@ -173,6 +174,7 @@ import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 import { tableFormBlurVer, FormBlur, getListByBottonInput } from '@/api/wms/business/inputBlur'
 import CollectionTable from '@/components/CollectionTable/src/CollectionTable.vue'
 import { isString } from 'min-dash'
+const { wsCache } = useCache()
 const count = ref(0)
 
 const props = defineProps({
@@ -430,21 +432,43 @@ const formType = ref('') // 表单的类型：create - 新增；update - 修改
 
 const formRef = ref() // 表单 Ref
 const formSchema = ref(props.formAllSchemas?.formSchema)
+const rules = ref(props.rules)
 const tableAllSchemas = ref(props.tableAllSchemas)
 const tableFormRules = ref(props.tableFormRules)
 const route = useRoute() // 路由信息
 const routeName = ref('')
 const sureDisabled = ref(false)
 const tabSheet = ref('TableForm')
+  console.log(555,props.tableAllSchemas)
+
 routeName.value = route.name
 const formHeight = ref({})
+if (!wsCache.get('ShowPackingNumber')) {
+  if (formSchema.value) {
+      formSchema.value = formSchema.value.filter(item => item.field != 'packingNumber')
+      delete rules.value.packingNumber
+  }
 
+  // delete rules.value.packUnit
+  // delete rules.value.packQty
+  // delete rules.value.outPackUnit
+  // delete rules.value.inPackUnit
+  if (props.tableAllSchemas) {
+    tableAllSchemas.value.tableFormColumns = props.tableAllSchemas.tableFormColumns.filter(item => item.field != 'packingNumber')
+    delete tableFormRules.value.packingNumber
+  // delete tableFormRules.value.packUnit
+  // delete tableFormRules.value.packQty
+  // delete tableFormRules.value.outPackUnit
+  // delete tableFormRules.value.inPackUnit
+  // delete tableFormRules.value.countQty
+  }
+
+}
 
 const tabChange = (item) => {
   tabSheet.value = item.prop
 }
 
-console.log(898989,formSchema.value)
 // 列表-按钮
 // const buttondata = [
 //   defaultButtons.mainListEditBtn(null), // 编辑
@@ -733,6 +757,7 @@ const open = async (
       }
     }
   }
+  
   if (row?.id || row?.masterId) {
     formLoading.value = true
     try {
@@ -801,6 +826,7 @@ const submitForm = async () => {
   if (!elForm) return
   const valid = await elForm.validate()
   if (!valid) return
+ 
   // 针对主子表 明细校验
   if (props.isBusiness) {
     // formLoading.value = true
@@ -818,6 +844,13 @@ const submitForm = async () => {
       // 主子表——提交请求
       try {
         const data = unref(formRef)?.formModel
+          if (!wsCache.get('ShowPackingNumber')  ) {
+          data.packingNumber=''
+          data.packUnit=''
+          data.packQty=''
+          data.outPackUnit=''
+          data.inPackUnit=''
+        }
         emit('submitForm', formType.value, data)
       } finally {
         // formLoading.value = false
@@ -826,6 +859,15 @@ const submitForm = async () => {
       // 编辑
       try {
         const data = unref(formRef)?.formModel
+        if (!wsCache.get('ShowPackingNumber')  ) {
+          data.packingNumber=''
+          data.packUnit=''
+          data.packQty=''
+          data.outPackUnit=''
+          data.inPackUnit=''
+        }
+        console.log(data);
+        
         emit('submitForm', formType.value, data)
       } finally {
         // formLoading.value = false
@@ -836,6 +878,14 @@ const submitForm = async () => {
     // formLoading.value = true
     try {
       const data = unref(formRef)?.formModel
+      // 清空包装号
+       if (!wsCache.get('ShowPackingNumber') ) {
+          data.packingNumber=''
+          data.packUnit=''
+          data.packQty=''
+          data.outPackUnit=''
+          data.inPackUnit=''
+        }
       emit('success', formType.value, data)
     } finally {
       // formLoading.value = false
diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index ea69c0f83..ee8391f3f 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -187,7 +187,7 @@
       ref="formRef"
       @success="submitForm"
       :rules="detailAllSchemasRules"
-      :formAllSchemas="detailAllSchemas"
+      :formAllSchemas="detailAllSchemasRef"
       :isBusiness="false"
       :apiUpdate="apiUpdate"
       :apiCreate="apiCreate"
@@ -221,6 +221,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue'
 import DetailTable from '@/components/DetailTable/src/DetailTable.vue'
 import { SearchTable } from '@/components/SearchTable'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+const { wsCache } = useCache()
 
 defineOptions({ name: 'Detail' })
 
@@ -455,6 +456,17 @@ const props = defineProps({
     default: 8
   },
 })
+const allSchemas = ref(props.allSchemas)
+const detailAllSchemasRef = ref(props.detailAllSchemas)
+const detailAllSchemasRules = ref(props.detailAllSchemasRules)
+if (!wsCache.get('ShowPackingNumber')) {
+  if (allSchemas.value) {
+    allSchemas.value.detailSchema = props.allSchemas.detailSchema.filter(item => item.field != 'packingNumber')
+    detailAllSchemasRef.value.tableColumns = props.detailAllSchemas.tableColumns.filter(item => item.field != 'packingNumber')
+    delete detailAllSchemasRules.value.packingNumber
+  }
+}
+
 const filterPermissionAnnexTable = ()=>{
   return props.annexTable.filter(item=>{
     const { wsCache } = useCache()
@@ -862,7 +874,6 @@ const getChangeRecordList = async () => {
 
 const tableObjectRef = ref()
 const tableMethodsRef = ref()
-const detailAllSchemasRef = ref()
 
 const { tableObject, tableMethods } = useTable({
   getListApi: props.apiPage // 分页接口
diff --git a/src/components/ImportForm/src/ImportCustomerStatementForm.vue b/src/components/ImportForm/src/ImportCustomerStatementForm.vue
index 477c2bd49..b7763482d 100644
--- a/src/components/ImportForm/src/ImportCustomerStatementForm.vue
+++ b/src/components/ImportForm/src/ImportCustomerStatementForm.vue
@@ -267,7 +267,6 @@ const props = defineProps({
   }
 })
 const importTemplateData = ref(props.importTemplateData)
-console.log(333,props.importTemplateData.dataType)
 const dataType = ref('')
 dataType.value = props.importTemplateData.dataType ?'&dataType=' + props.importTemplateData.dataType :''
 const accept = ref(props.accept)
diff --git a/src/components/ImportForm/src/ImportCustomerStatementShareForm.vue b/src/components/ImportForm/src/ImportCustomerStatementShareForm.vue
index 3881ebadf..13b52a746 100644
--- a/src/components/ImportForm/src/ImportCustomerStatementShareForm.vue
+++ b/src/components/ImportForm/src/ImportCustomerStatementShareForm.vue
@@ -232,7 +232,6 @@ const props = defineProps({
   }
 })
 const importTemplateData = ref(props.importTemplateData)
-console.log(333,props.importTemplateData.dataType)
 const dataType = ref('')
 dataType.value = props.importTemplateData.dataType ?'&dataType=' + props.importTemplateData.dataType :''
 const accept = ref(props.accept)
diff --git a/src/components/ImportForm/src/ImportForm.vue b/src/components/ImportForm/src/ImportForm.vue
index 7276097b4..970f380b7 100644
--- a/src/components/ImportForm/src/ImportForm.vue
+++ b/src/components/ImportForm/src/ImportForm.vue
@@ -230,7 +230,6 @@ const props = defineProps({
   }
 })
 const importTemplateData = ref(props.importTemplateData)
-console.log(333,props.importTemplateData.dataType)
 const dataType = ref('')
 dataType.value = props.importTemplateData.dataType ?'&dataType=' + props.importTemplateData.dataType :''
 const accept = ref(props.accept)
diff --git a/src/components/Search/src/Search.vue b/src/components/Search/src/Search.vue
index 81f58b97d..72ad3a8c6 100644
--- a/src/components/Search/src/Search.vue
+++ b/src/components/Search/src/Search.vue
@@ -77,6 +77,11 @@ const visible = ref(true)
 
 const newSchema = computed(() => {
   let schema: FormSchema[] = cloneDeep(props.schema)
+  if (!wsCache.get('ShowPackingNumber')) {
+    if (schema) {
+      schema = schema.filter(item => item.field != 'packingNumber')
+    }
+  }
   if (props.expand && props.expandField && !unref(visible)) {
     const index = findIndex(schema, (v: FormSchema) => v.field === props.expandField)
     if (index > -1) {
diff --git a/src/components/SearchHigh/src/SearchHigh.vue b/src/components/SearchHigh/src/SearchHigh.vue
index 97e597314..ca10540a5 100644
--- a/src/components/SearchHigh/src/SearchHigh.vue
+++ b/src/components/SearchHigh/src/SearchHigh.vue
@@ -77,6 +77,8 @@ import { Minus } from '@element-plus/icons-vue'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 import * as UserApi from '@/api/system/user'
+import { useCache } from '@/hooks/web/useCache'
+const { wsCache } = useCache()
 const { t } = useI18n()
 
 const userListAll = ref([])
@@ -119,6 +121,11 @@ const searchOption_high = ref(props.allSchemas?.tableColumns.filter(item => (ite
 const moreListData = ref({
   filters:[]
 })
+if (!wsCache.get('ShowPackingNumber')) {
+  if (searchOption_high.value) {
+    searchOption_high.value = searchOption_high.value.filter(item => item.field != 'packingNumber')
+  }
+}
 // 列表-操作按钮
 const butttondata = [
   defaultButtons.defaultSearchBtn(null), // 查询
diff --git a/src/components/Table/src/Table.vue b/src/components/Table/src/Table.vue
index e3499a988..d021328a9 100644
--- a/src/components/Table/src/Table.vue
+++ b/src/components/Table/src/Table.vue
@@ -102,7 +102,13 @@ export default defineComponent({
     }
 
     const setColumn = (columnProps: TableSetPropsType[], columnsChildren?: TableColumn[]) => {
-      const { columns } = unref(getProps)
+      let { columns } = unref(getProps)
+      
+      if (!wsCache.get('ShowPackingNumber')) {
+        if (columns) {
+          columns = columns.filter(item => item.field != 'packingNumber')
+        }
+      }
       for (const v of columnsChildren || columns) {
         for (const item of columnProps) {
           if (v.field === item.field) {
@@ -329,7 +335,7 @@ export default defineComponent({
 
 
     const rnderTableColumn = (columnsChildren?: TableColumn[]) => {
-      const {
+      let {
         columns,
         reserveIndex,
         pageSize,
@@ -339,6 +345,11 @@ export default defineComponent({
         showOverflowTooltip,
         border
       } = unref(getProps)
+      if (!wsCache.get('ShowPackingNumber')) {
+        if (columns) {
+          columns = columns.filter(item => item.field != 'packingNumber')
+        }
+      }
       //默认排序
       // updateSort(columns)
       return [...[renderTableExpand()], ...[renderTableSelection()]].concat(
diff --git a/src/views/eam/locationArea/index.vue b/src/views/eam/locationArea/index.vue
index f9453be9f..0b2536200 100644
--- a/src/views/eam/locationArea/index.vue
+++ b/src/views/eam/locationArea/index.vue
@@ -127,7 +127,6 @@
   /** 添加/修改操作 */
   const basicFormRef = ref()
   const openForm = (type : string, row ?: any) => {
-    console.log('33333', row )
     basicFormRef.value.open(type, row)
   }
 
diff --git a/src/views/login/components/LoginForm.vue b/src/views/login/components/LoginForm.vue
index af7eee2bd..41d07cae7 100644
--- a/src/views/login/components/LoginForm.vue
+++ b/src/views/login/components/LoginForm.vue
@@ -99,6 +99,7 @@
   import { getSystermUpdateAlert,getSystermUpdateUrl,getNeedCode } from '@/utils/systemParam'
   import {validateResetTime} from "@/api/system/password";
   import { Verify } from '@/components/Verifition'
+import { getSwitchByCode } from '@/api/wms/switch'
 
   const needCode = ref(getNeedCode()==true||getNeedCode()=='true')
 
@@ -305,6 +306,7 @@
       })
       if (loginData.loginForm.rememberMe) {
         authUtil.setLoginForm(loginData.loginForm)
+
       } else {
         authUtil.removeLoginForm()
       }
@@ -332,6 +334,9 @@
       // 存储 部门信息
       const { wsCache } = useCache()
       wsCache.set(CACHE_KEY.DEPT, await DeptApi.getSimpleDeptList())
+       await getSwitchByCode("ShowPackingNumber").then((res) => {
+        wsCache.set('ShowPackingNumber', res == 'TRUE' ? true : false)
+      })
     }catch (e){
       if(e.code === 1002000008){
         setTimeout(function (){
diff --git a/src/views/qms/inspectionRecord/addForm.vue b/src/views/qms/inspectionRecord/addForm.vue
index 7b267390b..81a7e60b9 100644
--- a/src/views/qms/inspectionRecord/addForm.vue
+++ b/src/views/qms/inspectionRecord/addForm.vue
@@ -1526,13 +1526,6 @@ const inspectionValueInput = (item, cur) => {
             .inspectionValue
         ) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
     ) {
-      console.log(parseFloat(
-          item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i]
-            .inspectionValue
-        ))
-      console.log( parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit))
-      console.log( parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping))
-      console.log(333)
       item.isPass = false
       return
     }
diff --git a/src/views/qms/inspectionRecordFirst/addForm.vue b/src/views/qms/inspectionRecordFirst/addForm.vue
index bd88637f5..b9c008bac 100644
--- a/src/views/qms/inspectionRecordFirst/addForm.vue
+++ b/src/views/qms/inspectionRecordFirst/addForm.vue
@@ -831,7 +831,6 @@ const processList = async (InspectionSchemeObj, list) => {
         }
       } else {
         // 汇总录入时
-        console.log(2333, item.inspectionJobCharacteristicsUpdateReqVO)
         item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
         rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false
         item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
@@ -1233,7 +1232,6 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => {
             }
           } else {
             // 汇总录入时
-            console.log(2333, item.inspectionJobCharacteristicsUpdateReqVO)
             item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
             rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required =
               false
@@ -1307,7 +1305,6 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => {
             }
           } else {
             // 汇总录入时
-            console.log(2333, item.inspectionJobCharacteristicsUpdateReqVO)
             item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
             rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required =
               false
diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
index 19015cc1d..e0a18101c 100644
--- a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
@@ -294,9 +294,7 @@ const handleExport = async () => {
 const BASE_URL = getJmreportBaseUrl()
 const labelType = ref('') // 标签类别 采购还是制造等
 const handlePoint = async (row) => {
-  console.log(row.packingNumber,445555555555555);
   PackageApi.getBalanceToPackage(row.relateNumber).then(res => {
-    console.log(777,res);
     if (res.productionLineCode != null) {
       labelType.value = 'zz'
     } else {
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
index 0a61065d8..068e4172b 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue
+++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
@@ -108,6 +108,7 @@ import { usePageLoading } from '@/hooks/web/usePageLoading'
 const { loadStart, loadDone } = usePageLoading()
 // 发料申请
 defineOptions({ name: 'IssueRequestMain' })
+console.log(88,IssueRequestDetail.allSchemas)
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
index d84487ae8..f9ea06520 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
@@ -334,7 +334,6 @@ const buttonOperationClick = async (row, label, index,isSave = false)=> {
   bomTableList.value = detatableDataBom.tableList
   console.log(row.fromLocationCode);
   detatableDataBom.tableList.forEach(async (item) => {
-    console.log(333,item)
     ProdcutscrapBomScrap.allSchemas.tableFormColumns.map((bomItem) => {
       if (bomItem.field == 'batch') {
         let condition = [{
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index a16df4d26..59b797b74 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -723,7 +723,6 @@ const getGenerateLabelList = async (row) => {
   await SupplierdeliverRequestDetailApi.getGenerateLabelList(params1).then((res) => {
     detatableData1.value = res
     detatableData1.value.forEach((item) => {
-      // console.log(3333, item?.boxPackaging[0])
       item.boxPackaging = item.boxPackaging ? item.boxPackaging : []
       item.packUnitInitOptions = item.boxPackaging
       item.secondPackUnitInitOptions = item.palletPackaging || []