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

src/api/wms/productreceiptJobMain/index.ts

@@ -116,6 +116,22 @@ export const exportProductreceiptJobMain = async (params) => {
   }
 }
 
+export const exportProductreceiptJobMainPredict = async (params) => {
+  params.type = 'predict'
+  if (params.isSearch) {
+    const cmd = {
+      'column':'type',
+      'action':'==',
+      'value':'predict'
+    }
+    params.filters.push(cmd)
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/productreceipt-job-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/productreceipt-job-main/export-excel`, params })
+  }
+}
+
 
 // 导出装配收货任务主 Excel
 export const exportProductreceiptJobMainAssemble = async (params) => {

src/api/wms/productreceiptRequestMain/index.ts

@@ -93,6 +93,16 @@ export const exportProductreceiptRequestMain = async (params) => {
   }
 }
 
+export const exportProductreceiptRequestMainPredict = async (params) => {
+  params.type = 'predict'
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/productreceipt-request-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/productreceipt-request-main/export-excel`, params })
+  }
+}
+
 // 导出制品收货申请主 Excel
 export const exportProductreceiptRequestMainAssemble = async (params) => {
   params.type = 'assemble'
@@ -143,4 +153,4 @@ export const handle = (id) => {
 // 创建标签
 export const productCreateLabel = async (data: ProductreceiptRequestMainVO) => {
   return await request.post({ url: `/wms/productreceipt-request-main/productCreateLabel`, data })
-}
+}

src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue

@@ -76,6 +76,7 @@ import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 import { getSwitchByCode } from '@/api/wms/switch'
+import { cloneDeep } from 'lodash-es'
 const { loadStart, loadDone } = usePageLoading()
 // 客户退货任务主
 defineOptions({ name: 'CustomerreturnJobMain' })
@@ -87,8 +88,7 @@ const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref([...CustomerreturnJobMain.allSchemas.tableColumns,...CustomerreturnJobDetail.allSchemas.tableMainColumns])
-
+const CustomerreturnJobMainAllSchema = ref(cloneDeep(CustomerreturnJobMain))
-const CustomerreturnJobMainAllSchema =ref(JSON.parse(JSON.stringify(CustomerreturnJobMain)))
 // 是否启用QMS开启显示q1q2q3
 const EnableQms = ref(true)
 const updateKey = ref(0)

src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue

@@ -73,6 +73,7 @@ import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 import { getSwitchByCode } from '@/api/wms/switch'
+import { cloneDeep } from 'lodash-es'
 const { loadStart, loadDone } = usePageLoading()
 // 客户退货记录主
 defineOptions({ name: 'CustomerreturnRecordMain' })
@@ -84,8 +85,7 @@ const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref([...CustomerreturnRecordMain.allSchemas.tableColumns,...CustomerreturnRecordDetail.allSchemas.tableMainColumns])
-
+const CustomerreturnRecordMainAllSchema = ref(cloneDeep(CustomerreturnRecordMain))
-const CustomerreturnRecordMainAllSchema =ref(JSON.parse(JSON.stringify(CustomerreturnRecordMain)))
 // 是否启用QMS开启显示q1q2q3
 const EnableQms = ref(true)
 const updateKey = ref(0)

src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue

@@ -121,6 +121,7 @@ import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 import { getSwitchByCode } from '@/api/wms/switch'
+import { cloneDeep } from 'lodash-es'
 const { loadStart, loadDone } = usePageLoading()
 // 客户退货申请
 defineOptions({ name: 'CustomerreturnRequestMain' })
@@ -133,7 +134,7 @@ const routeName = ref()
 const customerCode = ref()
 const genLabelId = ref(); //主表ID
 routeName.value = route.name
-const CustomerreturnRequestMainAllSchema =ref(JSON.parse(JSON.stringify(CustomerreturnRequestMain)))
+const CustomerreturnRequestMainAllSchema = ref(cloneDeep(CustomerreturnRequestMain))
 const tableColumns = ref([...CustomerreturnRequestMain.allSchemas.tableColumns, ...CustomerreturnRequestDetail.allSchemas.tableMainColumns])
 
 // 是否启用QMS开启显示q1q2q3

src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue

@@ -76,6 +76,7 @@ import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 import { getSwitchByCode } from '@/api/wms/switch'
+import { cloneDeep } from 'lodash-es'
 const { loadStart, loadDone } = usePageLoading()
 // 报废出库任务主
 defineOptions({ name: 'ScrapJobMain' })
@@ -87,8 +88,7 @@ const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref([...ScrapJobMain.allSchemas.tableColumns,...ScrapJobDetail.allSchemas.tableMainColumns])
-
+const ScrapJobMainAllSchema = ref(cloneDeep(ScrapJobMain))
-const ScrapJobMainAllSchema =ref(JSON.parse(JSON.stringify(ScrapJobMain)))
 // 是否启用QMS开启显示q1q2q3
 const EnableQms = ref(true)
 const updateKey = ref(0)

src/views/wms/inventoryjobManage/scrap/scrapRecordMain/index.vue

@@ -71,6 +71,7 @@ import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 import { getSwitchByCode } from '@/api/wms/switch'
+import { cloneDeep } from 'lodash-es'
 const { loadStart, loadDone } = usePageLoading()
 // 报废出库记录主
 defineOptions({ name: 'ScrapRecordMain' })
@@ -82,8 +83,7 @@ const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref([...ScrapRecordMain.allSchemas.tableColumns,...ScrapRecordDetail.allSchemas.tableMainColumns])
-
+const ScrapRecordMainAllSchema = ref(cloneDeep(ScrapRecordMain))
-const ScrapRecordMainAllSchema =ref(JSON.parse(JSON.stringify(ScrapRecordMain)))
 // 是否启用QMS开启显示q1q2q3
 const EnableQms = ref(true)
 const updateKey = ref(0)

src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue

@@ -122,6 +122,7 @@ import * as StdcostpriceApi from '@/api/wms/stdcostprice'
 import { getSwitchByCode } from '@/api/wms/switch'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
+import { cloneDeep } from 'lodash-es'
 const { loadStart, loadDone } = usePageLoading()
 // 报废出库申请
 defineOptions({ name: 'ScrapRequestMain' })
@@ -136,7 +137,7 @@ const tableColumns = ref([
   ...ScrapRequestMain.allSchemas.tableColumns,
   ...ScrapRequestDetail.allSchemas.tableMainColumns
 ])
-const ScrapRequestMainAllSchema =ref(JSON.parse(JSON.stringify(ScrapRequestMain)))
+const ScrapRequestMainAllSchema = ref(cloneDeep(ScrapRequestMain))
 // 是否启用QMS开启显示q1q2q3
 const EnableQms = ref(true)
 const updateKey = ref(0)

src/views/wms/issueManage/productionscrap/productionscrapRecordMain/index.vue

@@ -78,6 +78,7 @@ import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 import { getSwitchByCode } from '@/api/wms/switch'
+import { cloneDeep } from 'lodash-es'
 const { loadStart, loadDone } = usePageLoading()
 // 生产退料记录主
 defineOptions({ name: 'ProductionscrapRecordMain' })
@@ -89,7 +90,7 @@ const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref([...ProductionscrapRecordMain.allSchemas.tableColumns,...ProductionscrapRecordDetail.allSchemas.tableMainColumns])
-const ProductionscrapRecordMainAllSchema =ref(JSON.parse(JSON.stringify(ProductionscrapRecordMain)))
+const ProductionscrapRecordMainAllSchema = ref(cloneDeep(ProductionscrapRecordMain))
 // 是否启用QMS开启显示q1q2q3
 const EnableQms = ref(true)
 const updateKey = ref(0)

src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue

@@ -127,6 +127,7 @@ import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 import { getSwitchByCode } from '@/api/wms/switch'
+import { cloneDeep } from 'lodash-es'
 const { loadStart, loadDone } = usePageLoading()
 // 线标原料报废申请
 defineOptions({ name: 'ProductionscrapRequestMain' })
@@ -138,7 +139,7 @@ const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref([...ProductionscrapRequestMain.allSchemas.tableColumns,...ProductionscrapRequestDetail.allSchemas.tableMainColumns])
-const ProductionscrapRequestMainAllSchema =ref(JSON.parse(JSON.stringify(ProductionscrapRequestMain)))
+const ProductionscrapRequestMainAllSchema = ref(cloneDeep(ProductionscrapRequestMain))
 // 是否启用QMS开启显示q1q2q3
 const EnableQms = ref(true)
 const updateKey = ref(0)

src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue

@@ -300,6 +300,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       }
     } else {
       const setV = {}
+      if(formField == 'workshopCode'){
+        tableData.value = []
+      }
       setV[formField] = val[0][searchField]
       formRef.setValues(setV)
     }

src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue

@@ -106,6 +106,7 @@ import {
 
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
+import {exportProductreceiptJobMainPredict} from "@/api/wms/productreceiptJobMain";
 const { loadStart, loadDone } = usePageLoading()
 // 制品收货任务主
 // 预生产收货任务主
@@ -352,7 +353,7 @@ const handleExport = async () => {
     // 发起导出
     loadStart()
     const excelTitle = ref(route.meta.title)
-    const data = await ProductreceiptJobMainApi.exportProductreceiptJobMain(tableObject.params)
+    const data = await ProductreceiptJobMainApi.exportProductreceiptJobMainPredict(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {

src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue

@@ -189,6 +189,7 @@ import { formatDate } from '@/utils/formatTime'
 import * as WorkshopApi from '@/api/wms/workshop'
 import * as ConfigApi from '@/api/infra/config'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
+import {exportProductreceiptRequestMainPredict} from "@/api/wms/productreceiptRequestMain";
 const { loadStart, loadDone } = usePageLoading()
 // 制品收货申请
 // 预生产收货申请
@@ -687,7 +688,7 @@ const handleExport = async () => {
     // 发起导出
     loadStart()
     const excelTitle = ref(route.meta.title)
-    const data = await ProductreceiptRequestMainApi.exportProductreceiptRequestMain(
+    const data = await ProductreceiptRequestMainApi.exportProductreceiptRequestMainPredict(
       tableObject.params
     )
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)

src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue

@@ -284,6 +284,13 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       }
     } else {
       const setV = {}
+      if(formField == 'workshopCode'){
+        setV['productionLineCode'] = ''
+        tableData.value = []
+      }
+      if(formField == 'productionLineCode'){
+        tableData.value = []
+      }
       setV[formField] = val[0][searchField]
       formRef.setValues(setV)
     }

src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue

@@ -33,9 +33,6 @@
           <span>{{ row.number }}</span>
         </el-button>
       </template>
-      <template #revokeFlag="{row}">
-        <el-tag :type="getTag(row.revokeFlag).colorType">{{ getTag(row.revokeFlag).label}}</el-tag>
-      </template>
       <template #action="{ row,$index }">
         <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
@@ -101,8 +98,7 @@ import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 import { getSwitchByCode } from '@/api/wms/switch'
-import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import { cloneDeep } from 'lodash-es'
-const dictOptions= ref(getStrDictOptions(DICT_TYPE.TRUE_FALSE))
 const { loadStart, loadDone } = usePageLoading()
 // 制品报废记录主
 defineOptions({ name: 'ProductscrapRecordMain' })
@@ -114,7 +110,7 @@ const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref([...ProductscrapRecordMain.allSchemas.tableColumns,...ProductscrapRecordDetail.allSchemas.tableMainColumns])
-const ProductscrapRecordMainAllSchema =ref(JSON.parse(JSON.stringify(ProductscrapRecordMain)))
+const ProductscrapRecordMainAllSchema = ref(cloneDeep(ProductscrapRecordMain))
 // 是否启用QMS开启显示q1q2q3
 const EnableQms = ref(true)
 const updateKey = ref(0)
@@ -136,10 +132,6 @@ const getSwitchByCode1 =async ()  => {
 }
 getSwitchByCode1()
 
-const getTag = (value) => {
-  return dictOptions.value.find(item=>item.value === value)
-}
-
 // 详情 table 操作扩展 按钮
 const buttondataTable = ref([{
   label: 'Bom',

src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue

@@ -145,6 +145,7 @@ import * as BalanceApi from "@/api/wms/balance";
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 import { getSwitchByCode } from '@/api/wms/switch'
+import { cloneDeep } from 'lodash-es'
 const { loadStart, loadDone } = usePageLoading()
 // 制品报废申请
 defineOptions({ name: 'ProductscrapRequestMain' })
@@ -156,7 +157,7 @@ const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref([...ProductscrapRequestMain.allSchemas.tableColumns,...ProductscrapRequestDetail.allSchemas.tableMainColumns])
-const ProductscrapRequestMainAllSchema =ref(JSON.parse(JSON.stringify(ProductscrapRequestMain)))
+const ProductscrapRequestMainAllSchema = ref(cloneDeep(ProductscrapRequestMain))
 // 是否启用QMS开启显示q1q2q3
 const EnableQms = ref(true)
 const updateKey = ref(0)
@@ -166,7 +167,7 @@ const getSwitchByCode1 =async ()  => {
   if (EnableQms.value) {
     ProductscrapRequestMain.allSchemas = ProductscrapRequestMainAllSchema.value.allSchemas
   } else {
-    ProductscrapRequestMain.allSchemas.formSchema = ProductscrapRequestMainAllSchema.value.allSchemas.formSchema.filter(item =>item.field != 'q3Number')
+    ProductscrapRequestMain.allSchemas.formSchema = ProductscrapRequestMainAllSchema.value.allSchemas.formSchema.filter(item => item.field != 'q3Number')
     ProductscrapRequestMain.allSchemas.tableColumns = ProductscrapRequestMainAllSchema.value.allSchemas.tableColumns.filter(item => item.field != 'q3Number')
     ProductscrapRequestMain.allSchemas.tableFormColumns = ProductscrapRequestMainAllSchema.value.allSchemas.tableFormColumns.filter(item => item.field != 'q3Number')
     ProductscrapRequestMain.allSchemas.tableMainColumns = ProductscrapRequestMainAllSchema.value.allSchemas.tableMainColumns.filter(item => item.field != 'q3Number')
@@ -541,6 +542,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         setV['costCenterType'] = val[0]['costcentreType']
       }else  if(formField == 'productionLineCode'){
         tableData.value = []
+      }  else if(formField == 'workshopCode'){
+        tableData.value = []
       }
       formRef.setValues(setV)
     }

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue

@@ -76,6 +76,7 @@ import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 import { getSwitchByCode } from '@/api/wms/switch'
+import { cloneDeep } from 'lodash-es'
 const { loadStart, loadDone } = usePageLoading()
 // 采购退货任务主
 defineOptions({ name: 'PurchasereturnJobMain' })
@@ -87,7 +88,7 @@ const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref([...PurchasereturnJobMain.allSchemas.tableColumns,...PurchasereturnJobDetail.allSchemas.tableColumns])
-const PurchasereturnJobMainAllSchema =ref(JSON.parse(JSON.stringify(PurchasereturnJobMain)))
+const PurchasereturnJobMainAllSchema = ref(cloneDeep(PurchasereturnJobMain))
 
 // 是否启用QMS开启显示q1q2q3
 const EnableQms = ref(true)

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue

@@ -73,6 +73,7 @@ import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 import { getSwitchByCode } from '@/api/wms/switch'
+import { cloneDeep } from 'lodash-es'
 const { loadStart, loadDone } = usePageLoading()
 // 采购退货记录主
 defineOptions({ name: 'PurchasereturnRecordMain' })
@@ -84,7 +85,7 @@ const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref([...PurchasereturnRecordMain.allSchemas.tableColumns,...PurchasereturnRecordDetail.allSchemas.tableMainColumns])
-const PurchasereturnRecordMainAllSchema =ref(JSON.parse(JSON.stringify(PurchasereturnRecordMain)))
+const PurchasereturnRecordMainAllSchema = ref(cloneDeep(PurchasereturnRecordMain))
 
 // 是否启用QMS开启显示q1q2q3
 const EnableQms = ref(true)

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue

@@ -187,6 +187,7 @@ import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 import { getSwitchByCode } from '@/api/wms/switch'
+import { cloneDeep } from 'lodash-es'
 const { loadStart, loadDone } = usePageLoading()
 // 采购退货申请
 defineOptions({ name: 'PurchasereturnRequestMainNew' })
@@ -204,9 +205,8 @@ const tableColumns = ref([
 
 const isShowButton = ref(true)
 
-
+const PurchasereturnRequestMainNewAllSchema = ref(cloneDeep(PurchasereturnRequestMainNew))
-const PurchasereturnRequestMainNewAllSchema =ref(JSON.parse(JSON.stringify(PurchasereturnRequestMainNew)))
+const PurchasereturnRequestMainAllSchema = ref(cloneDeep(PurchasereturnRequestMain))
-const PurchasereturnRequestMainAllSchema =ref(JSON.parse(JSON.stringify(PurchasereturnRequestMain)))
 // 是否启用QMS开启显示q1q2q3
 const EnableQms = ref(true)
 const updateKey = ref(0)