Merge branch 'cjerp-contract-1.0' of http://gitlab.qgutech.com/zhuyuanliang/erp-…

…mobile into test_cjerp

@@ -86,3 +86,12 @@ export function uploadWarrantyCertificate(params) {
     contentType: ContentTypeEnum.JSON
     contentType: ContentTypeEnum.JSON
   })
   })
 }
 }
+
+// 根据ID获取历史生产工艺
+export function getHistoryProductionProcessApi(id) {
+  return request({
+    url: `${baseUrl}/getHistoryProductionProcess`,
+    method: 'get',
+    params: { id }
+  })
+}

@@ -230,7 +230,7 @@ import SingleSelectSheet from '@/components/single-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
 import ProductRel from './productRel.vue'
 import ProductRel from './productRel.vue'
 import CitySelector from '@/components/city-selector/index.vue'
 import CitySelector from '@/components/city-selector/index.vue'
-import { getRetailCodeApi, createContractApi, getCustomerRemarks,getCustomerSpecificQualityRequirements,getDeptApi } from '@/api/contract'
+import { getRetailCodeApi, createContractApi, getCustomerRemarks, getCustomerSpecificQualityRequirements, getDeptApi, getContractApi } from '@/api/contract'
 import { getDicByCodes } from '@/utils/dic'
 import { getDicByCodes } from '@/utils/dic'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { workshopQueryApi } from '@/api/devManage'
 import { workshopQueryApi } from '@/api/devManage'
@@ -242,6 +242,8 @@ export default {
     components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector },
     components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector },
     data() {
     data() {
         return {
         return {
+            copyId: '',
+            operateType: 'ADD',
             form: {
             form: {
                 code: '',
                 code: '',
                 supplier: '',
                 supplier: '',
@@ -296,13 +298,22 @@ export default {
             regionOptions: [],
             regionOptions: [],
         }
         }
     },
     },
+    onLoad(query) {
+        const copyId = (query && query.copyId) ? String(query.copyId) : ''
+        this.copyId = copyId
+        this.operateType = copyId ? 'COPY' : 'ADD'
+        uni.setNavigationBarTitle({
+            title: copyId ? '复制外贸标准合同' : '新增外贸标准合同'
+        })
+    },
     created() {
     created() {
         this.loadSuppliers()
         this.loadSuppliers()
         this.loadExtraOptions()
         this.loadExtraOptions()
         this.initCode()
         this.initCode()
         this.getDept()
         this.getDept()
         this.loadRegionOptions()
         this.loadRegionOptions()
-        this.form.orderDate = this.formatDate(new Date())
+        if (!this.copyId) this.form.orderDate = this.formatDate(new Date())
+        if (this.copyId) this.loadCopyDetail(this.copyId)
         this.$nextTick(() => {
         this.$nextTick(() => {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
                 this.initDestinationLabel()
                 this.initDestinationLabel()
@@ -351,6 +362,83 @@ export default {
         },
         },
     },
     },
     methods: {
     methods: {
+        async loadCopyDetail(id) {
+            const rid = (id !== undefined && id !== null) ? String(id) : ''
+            if (!rid) return
+            try {
+                const res = await getContractApi(rid)
+                const data = res && res.data ? res.data : {}
+                const includesPackagingFeeName = data.includesPackagingFeeName || (data.includesPackagingFee ? '是' : '否')
+                const includesTransportFeeName = data.includesTransportFeeName || (data.includesTransportFee ? '是' : '否')
+                const m = { ...data, includesPackagingFeeName, includesTransportFeeName }
+
+                const code = this.form.code
+                this.form = {
+                    ...this.form,
+                    supplier: m.supplier || '',
+                    supplierName: m.supplierName || '',
+                    buyer: m.buyer || (m.customer && m.customer.id) || '',
+                    buyerName: m.buyerName || (m.customer && m.customer.name) || '',
+                    stockUpCompanyId: m.stockUpCompanyId || '',
+                    stockUpCompanyName: m.stockUpCompanyName || '',
+                    deptName: m.deptName || this.form.deptName,
+                    deptId: m.deptId || this.form.deptId,
+                    region: m.region || '',
+                    regionName: m.regionName || '',
+                    orderDate: m.orderDate || this.form.orderDate,
+                    deliveryDate: m.deliveryDate || '',
+                    designatedConsignee: m.designatedConsignee || '',
+                    specialTerms: m.specialTerms || '',
+                    specialTermsName: m.specialTermsName || '',
+                    executionStandard: m.executionStandard || '',
+                    executionStandardName: m.executionStandardName || '',
+                    executionStandardRemarks: m.executionStandardRemarks || '',
+                    includesPackagingFee: !!m.includesPackagingFee,
+                    includesPackagingFeeName,
+                    includesTransportFee: !!m.includesTransportFee,
+                    includesTransportFeeName,
+                    unit: m.unit || this.form.unit,
+                    totalAmountCapital: m.totalAmountCapital || '',
+                    depositInfo: m.depositInfo || '',
+                    packagingRequirements: m.packagingRequirements || '',
+                    paymentTerms: m.paymentTerms || '',
+                    transportMode: m.transportMode || '',
+                    destinationId: (m.provinceId && m.cityId && m.districtId) ? [m.provinceId, m.cityId, m.districtId] : (Array.isArray(m.destinationId) ? m.destinationId : []),
+                    destinationLabel: (m.provinceName && m.cityName && m.districtName) ? `${m.provinceName} / ${m.cityName} / ${m.districtName}` : (m.destinationLabel || ''),
+                    specialInstructions: m.specialInstructions || '',
+                    remarks: m.remarks || '',
+                    pieceWeightHead: m.pieceWeightHead || '',
+                    surface: m.surface || '',
+                    tolerance: m.tolerance || '',
+                    performance: m.performance || '',
+                    component: m.component || '',
+                    packaging: m.packaging || '',
+                    workshopId: m.workshopId || '',
+                    workshopIdName: m.workshopName || m.workshopIdName || '',
+                    code,
+                }
+
+                const lines = Array.isArray(m.contractDistributorLineList) ? m.contractDistributorLineList : []
+                await this.$nextTick()
+                const comp = this.$refs.productRel
+                if (comp && typeof comp.defaultItem === 'function') {
+                    const nextItems = (lines.length ? lines : [{}]).map(x => ({
+                        ...comp.defaultItem(),
+                        ...x,
+                        sampleOrder: !!x.sampleOrder,
+                        collapsed: true
+                    }))
+                    if (!lines.length && nextItems[0]) nextItems[0].collapsed = false
+                    comp.items = nextItems
+                    if (typeof comp.recalculateAll === 'function') comp.recalculateAll()
+                    if (typeof comp.emitChange === 'function') comp.emitChange()
+                } else {
+                    this.onProductsChange(lines)
+                }
+            } catch (e) {
+                uni.showToast({ title: '复制失败，请稍后重试', icon: 'none' })
+            }
+        },
         async loadRegionOptions() {
         async loadRegionOptions() {
             try {
             try {
                 const res = await getArea()
                 const res = await getArea()
@@ -554,8 +642,9 @@ export default {
         },
         },
         async onSubmit() {
         async onSubmit() {
             if (!this.validateRequired()) return
             if (!this.validateRequired()) return
+            const isCopy = !!this.copyId
             const confirmRes = await new Promise(resolve => {
             const confirmRes = await new Promise(resolve => {
-                uni.showModal({ title: '提示', content: '确定新增外贸标准合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
+                uni.showModal({ title: '提示', content: isCopy ? '确定复制外贸标准合同吗？' : '确定新增外贸标准合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
             })
             })
             if (!(confirmRes && confirmRes.confirm)) return
             if (!(confirmRes && confirmRes.confirm)) return
             const clean = (obj) => {
             const clean = (obj) => {
@@ -575,6 +664,7 @@ export default {
             const destination = destinationId && destinationId.length > 0 ? destinationId[destinationId.length - 1] : '';
             const destination = destinationId && destinationId.length > 0 ? destinationId[destinationId.length - 1] : '';
             const payload = clean({
             const payload = clean({
                 ...formForSubmit,
                 ...formForSubmit,
+                operateType: isCopy ? 'COPY' : 'ADD',
                 destination,
                 destination,
                 type: 'INTL_STD_CONTRACT',
                 type: 'INTL_STD_CONTRACT',
                 totalQuantity: this.totalQuantity,
                 totalQuantity: this.totalQuantity,
@@ -586,10 +676,10 @@ export default {
             
             
             try {
             try {
                 await createContractApi(payload)
                 await createContractApi(payload)
-                uni.showToast({ title: '新增成功', icon: 'none' })
+                uni.showToast({ title: isCopy ? '复制成功' : '新增成功', icon: 'none' })
                 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_foreign_std/index' }) }, 400)
                 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_foreign_std/index' }) }, 400)
             } catch (e) {
             } catch (e) {
-                uni.showToast({ title: e.msg ||'提交失败', icon: 'none' })
+                uni.showToast({ title: e.msg || (isCopy ? '复制失败' : '提交失败'), icon: 'none' })
             }
             }
         },
         },
         validateRequired() {
         validateRequired() {

@@ -219,6 +219,12 @@ export default {
                 visible: true,
                 visible: true,
                 event: 'auditDetail'
                 event: 'auditDetail'
             },
             },
+            {
+                text: '复制',
+                visible: true,
+                variant: 'outline',
+                event: 'copy'
+            },
             ],
             ],
         }
         }
     },
     },
@@ -234,6 +240,7 @@ export default {
                 { ...this.buttons[3], visible: (s === 'STANDARD' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:upload-seal')) },
                 { ...this.buttons[3], visible: (s === 'STANDARD' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:upload-seal')) },
                 { ...this.buttons[5], visible: (s === 'STANDARD' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:review')) },
                 { ...this.buttons[5], visible: (s === 'STANDARD' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:review')) },
                 { ...this.buttons[4], visible: (s === 'STANDARD' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:approve')) },
                 { ...this.buttons[4], visible: (s === 'STANDARD' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:approve')) },
+                { ...this.buttons[6], visible: (s !== 'DELETED' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:copy')) },
             ]
             ]
         }
         }
     },
     },
@@ -363,10 +370,21 @@ export default {
             if (e === 'uploadSeal') return this.uploadContract(this.detail.id || '', 'seal')
             if (e === 'uploadSeal') return this.uploadContract(this.detail.id || '', 'seal')
             if (e === 'audit') return this.onAudit(btn && btn.params)
             if (e === 'audit') return this.onAudit(btn && btn.params)
             if (e === 'auditDetail') return this.onAuditDetail(btn && btn.params)
             if (e === 'auditDetail') return this.onAuditDetail(btn && btn.params)
+            if (e === 'copy') return this.onCopy(btn && btn.params)
         },
         },
         getBusinessId() {
         getBusinessId() {
             return (this.detail && (this.detail.id || this.detail.code)) || ''
             return (this.detail && (this.detail.id || this.detail.code)) || ''
         },
         },
+        onCopy() {
+            const id = this.getBusinessId()
+            if (!id) {
+                uni.showToast({ title: '未获取到合同ID，无法复制', icon: 'none' })
+                return
+            }
+            uni.navigateTo({
+                url: '/pages/contract_foreign_std/add?copyId=' + encodeURIComponent(id)
+            })
+        },
         onAudit() {
         onAudit() {
             const CACHE_KEY = 'sourceBusinessId'
             const CACHE_KEY = 'sourceBusinessId'
             uni.setStorageSync(CACHE_KEY, this.getBusinessId())
             uni.setStorageSync(CACHE_KEY, this.getBusinessId())
@@ -566,4 +584,4 @@ export default {
 .upload-row {
 .upload-row {
     margin-top: 20rpx;
     margin-top: 20rpx;
 }
 }
-</style>
+</style>

@@ -233,7 +233,7 @@ import SingleSelectSheet from '@/components/single-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
 import ProductRel from './productRel.vue'
 import ProductRel from './productRel.vue'
 import CitySelector from '@/components/city-selector/index.vue'
 import CitySelector from '@/components/city-selector/index.vue'
-import { getRetailCodeApi, createContractApi, getCustomerSpecificQualityRequirements,getCustomerRemarks, getDeptApi } from '@/api/contract'
+import { getRetailCodeApi, createContractApi, getCustomerSpecificQualityRequirements, getCustomerRemarks, getDeptApi, getContractApi } from '@/api/contract'
 import { getDicByCodes } from '@/utils/dic'
 import { getDicByCodes } from '@/utils/dic'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { workshopQueryApi } from '@/api/devManage'
 import { workshopQueryApi } from '@/api/devManage'
@@ -244,6 +244,8 @@ export default {
     components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector },
     components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector },
     data() {
     data() {
         return {
         return {
+            copyId: '',
+            operateType: 'ADD',
             form: {
             form: {
                 code: '',
                 code: '',
                 supplier: '',
                 supplier: '',
@@ -298,13 +300,22 @@ export default {
             regionOptions: [],
             regionOptions: [],
         }
         }
     },
     },
+    onLoad(query) {
+        const copyId = (query && query.copyId) ? String(query.copyId) : ''
+        this.copyId = copyId
+        this.operateType = copyId ? 'COPY' : 'ADD'
+        uni.setNavigationBarTitle({
+            title: copyId ? '复制外贸库存合同' : '新增外贸库存合同'
+        })
+    },
     created() {
     created() {
         this.loadSuppliers()
         this.loadSuppliers()
         this.loadExtraOptions()
         this.loadExtraOptions()
         this.initCode()
         this.initCode()
         this.getDept()
         this.getDept()
         this.loadRegionOptions()
         this.loadRegionOptions()
-        this.form.orderDate = this.formatDate(new Date())
+        if (!this.copyId) this.form.orderDate = this.formatDate(new Date())
+        if (this.copyId) this.loadCopyDetail(this.copyId)
         this.$nextTick(() => {
         this.$nextTick(() => {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
                 this.initDestinationLabel()
                 this.initDestinationLabel()
@@ -353,6 +364,82 @@ export default {
         },
         },
     },
     },
     methods: {
     methods: {
+        async loadCopyDetail(id) {
+            const rid = (id !== undefined && id !== null) ? String(id) : ''
+            if (!rid) return
+            try {
+                const res = await getContractApi(rid)
+                const data = res && res.data ? res.data : {}
+                const includesPackagingFeeName = data.includesPackagingFeeName || (data.includesPackagingFee ? '是' : '否')
+                const includesTransportFeeName = data.includesTransportFeeName || (data.includesTransportFee ? '是' : '否')
+                const m = { ...data, includesPackagingFeeName, includesTransportFeeName }
+
+                const code = this.form.code
+                this.form = {
+                    ...this.form,
+                    supplier: m.supplier || '',
+                    supplierName: m.supplierName || '',
+                    buyer: m.buyer || (m.customer && m.customer.id) || '',
+                    buyerName: m.buyerName || (m.customer && m.customer.name) || '',
+                    stockUpCompanyId: m.stockUpCompanyId || '',
+                    stockUpCompanyName: m.stockUpCompanyName || '',
+                    deptName: m.deptName || this.form.deptName,
+                    deptId: m.deptId || this.form.deptId,
+                    region: m.region || '',
+                    regionName: m.regionName || '',
+                    orderDate: m.orderDate || this.form.orderDate,
+                    deliveryDate: m.deliveryDate || '',
+                    designatedConsignee: m.designatedConsignee || '',
+                    specialTerms: m.specialTerms || '',
+                    specialTermsName: m.specialTermsName || '',
+                    executionStandard: m.executionStandard || '',
+                    executionStandardName: m.executionStandardName || '',
+                    executionStandardRemarks: m.executionStandardRemarks || '',
+                    includesPackagingFee: !!m.includesPackagingFee,
+                    includesPackagingFeeName,
+                    includesTransportFee: !!m.includesTransportFee,
+                    includesTransportFeeName,
+                    unit: m.unit || this.form.unit,
+                    totalAmountCapital: m.totalAmountCapital || '',
+                    depositInfo: m.depositInfo || '',
+                    packagingRequirements: m.packagingRequirements || '',
+                    paymentTerms: m.paymentTerms || '',
+                    transportMode: m.transportMode || '',
+                    destinationId: (m.provinceId && m.cityId && m.districtId) ? [m.provinceId, m.cityId, m.districtId] : (Array.isArray(m.destinationId) ? m.destinationId : []),
+                    destinationLabel: (m.provinceName && m.cityName && m.districtName) ? `${m.provinceName} / ${m.cityName} / ${m.districtName}` : (m.destinationLabel || ''),
+                    specialInstructions: m.specialInstructions || '',
+                    remarks: m.remarks || '',
+                    packaging: m.packaging || '',
+                    performance: m.performance || '',
+                    pieceWeightHead: m.pieceWeightHead || '',
+                    surface: m.surface || '',
+                    tolerance: m.tolerance || '',
+                    workshopId: m.workshopId || '',
+                    workshopIdName: m.workshopName || m.workshopIdName || '',
+                    code,
+                }
+
+                const lines = Array.isArray(m.contractDistributorLineList) ? m.contractDistributorLineList : []
+                await this.$nextTick()
+                const comp = this.$refs.productRel
+                if (comp && typeof comp.defaultItem === 'function') {
+                    const nextItems = (lines.length ? lines : [{}]).map(x => ({
+                        ...comp.defaultItem(),
+                        ...x,
+                        sampleOrder: !!x.sampleOrder,
+                        collapsed: true
+                    }))
+                    if (!lines.length && nextItems[0]) nextItems[0].collapsed = false
+                    comp.items = nextItems
+                    if (typeof comp.recalculateAll === 'function') comp.recalculateAll()
+                    if (typeof comp.emitChange === 'function') comp.emitChange()
+                } else {
+                    this.onProductsChange(lines)
+                }
+            } catch (e) {
+                uni.showToast({ title: '复制失败，请稍后重试', icon: 'none' })
+            }
+        },
         async loadRegionOptions() {
         async loadRegionOptions() {
             try {
             try {
                 const res = await getArea()
                 const res = await getArea()
@@ -558,8 +645,9 @@ export default {
         },
         },
         async onSubmit() {
         async onSubmit() {
             if (!this.validateRequired()) return
             if (!this.validateRequired()) return
+            const isCopy = !!this.copyId
             const confirmRes = await new Promise(resolve => {
             const confirmRes = await new Promise(resolve => {
-                uni.showModal({ title: '提示', content: '确定新增外贸库存合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
+                uni.showModal({ title: '提示', content: isCopy ? '确定复制外贸库存合同吗？' : '确定新增外贸库存合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
             })
             })
             if (!(confirmRes && confirmRes.confirm)) return
             if (!(confirmRes && confirmRes.confirm)) return
             const clean = (obj) => {
             const clean = (obj) => {
@@ -579,6 +667,7 @@ export default {
             const destination = destinationId && destinationId.length > 0 ? destinationId[destinationId.length - 1] : '';
             const destination = destinationId && destinationId.length > 0 ? destinationId[destinationId.length - 1] : '';
             const payload = clean({
             const payload = clean({
                 ...formForSubmit,
                 ...formForSubmit,
+                operateType: isCopy ? 'COPY' : 'ADD',
                 destination,
                 destination,
                 type: 'INTL_INVENTORY_AGMT',
                 type: 'INTL_INVENTORY_AGMT',
                 totalQuantity: this.totalQuantity,
                 totalQuantity: this.totalQuantity,
@@ -590,10 +679,10 @@ export default {
             
             
             try {
             try {
                 await createContractApi(payload)
                 await createContractApi(payload)
-                uni.showToast({ title: '新增成功', icon: 'none' })
+                uni.showToast({ title: isCopy ? '复制成功' : '新增成功', icon: 'none' })
                 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_foreign_stock/index' }) }, 400)
                 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_foreign_stock/index' }) }, 400)
             } catch (e) {
             } catch (e) {
-                uni.showToast({ title: e.msg ||'提交失败', icon: 'none' })
+                uni.showToast({ title: e.msg || (isCopy ? '复制失败' : '提交失败'), icon: 'none' })
             }
             }
         },
         },
         validateRequired() {
         validateRequired() {

@@ -279,6 +279,12 @@ export default {
                 variant: 'outline',
                 variant: 'outline',
                 event: 'uploadSeal'
                 event: 'uploadSeal'
             },
             },
+            {
+                text: '复制',
+                visible: true,
+                variant: 'outline',
+                event: 'copy'
+            },
             ],
             ],
         }
         }
     },
     },
@@ -304,6 +310,7 @@ export default {
                 { ...this.buttons[6], visible: (s === 'FORMAL' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:approve')) },
                 { ...this.buttons[6], visible: (s === 'FORMAL' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:approve')) },
                 { ...this.buttons[7], visible: (s === 'STANDARD' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:approve')) },
                 { ...this.buttons[7], visible: (s === 'STANDARD' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:approve')) },
                 { ...this.buttons[8], visible: (s === 'STANDARD' && f && a === 'AUDIT' && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:standard-approve')) }, 
                 { ...this.buttons[8], visible: (s === 'STANDARD' && f && a === 'AUDIT' && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:standard-approve')) }, 
+                { ...this.buttons[13], visible: (s !== 'DELETED' && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:copy')) },
             ]
             ]
         }
         }
     },
     },
@@ -451,8 +458,22 @@ export default {
             if (e === 'auditDetail2') return this.onAuditDetail(this.detail.parentId || '', 'FORMAL_CONTRACT')
             if (e === 'auditDetail2') return this.onAuditDetail(this.detail.parentId || '', 'FORMAL_CONTRACT')
             if (e === 'auditDetail3') return this.onAuditDetail(this.detail.id || '', 'STANDARD_CONTRACT')
             if (e === 'auditDetail3') return this.onAuditDetail(this.detail.id || '', 'STANDARD_CONTRACT')
             if (e === 'uploadSeal') return this.uploadContract(this.detail.id || '', 'seal')
             if (e === 'uploadSeal') return this.uploadContract(this.detail.id || '', 'seal')
+            if (e === 'copy') return this.onCopy(btn && btn.params)
 
 
         },
         },
+        getBusinessId() {
+            return (this.detail && (this.detail.id || this.detail.code)) || ''
+        },
+        onCopy() {
+            const id = this.getBusinessId()
+            if (!id) {
+                uni.showToast({ title: '未获取到合同ID，无法复制', icon: 'none' })
+                return
+            }
+            uni.navigateTo({
+                url: '/pages/contract_foreign_stock/add?copyId=' + encodeURIComponent(id)
+            })
+        },
         onAudit(id, type) {
         onAudit(id, type) {
             const CACHE_KEY = 'sourceBusinessId'
             const CACHE_KEY = 'sourceBusinessId'
             const TYPE = 'contractType'
             const TYPE = 'contractType'
@@ -655,4 +676,4 @@ export default {
 .upload-row {
 .upload-row {
     margin-top: 20rpx;
     margin-top: 20rpx;
 }
 }
-</style>
+</style>

@@ -231,7 +231,7 @@ import SingleSelectSheet from '@/components/single-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
 import ProductRel from './productRel.vue'
 import ProductRel from './productRel.vue'
 import CitySelector from '@/components/city-selector/index.vue'
 import CitySelector from '@/components/city-selector/index.vue'
-import { getRetailCodeApi, createContractApi, getCustomerRemarks,getCustomerSpecificQualityRequirements, getDeptApi } from '@/api/contract'
+import { getRetailCodeApi, createContractApi, getCustomerRemarks, getCustomerSpecificQualityRequirements, getDeptApi, getContractApi } from '@/api/contract'
 import { getDicByCodes } from '@/utils/dic'
 import { getDicByCodes } from '@/utils/dic'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { workshopQueryApi } from '@/api/devManage'
 import { workshopQueryApi } from '@/api/devManage'
@@ -242,6 +242,8 @@ export default {
     components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector },
     components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector },
     data() {
     data() {
         return {
         return {
+            copyId: '',
+            operateType: 'ADD',
             form: {
             form: {
                 code: '',
                 code: '',
                 supplier: '',
                 supplier: '',
@@ -296,13 +298,22 @@ export default {
             regionOptions: [],
             regionOptions: [],
         }
         }
     },
     },
+    onLoad(query) {
+        const copyId = (query && query.copyId) ? String(query.copyId) : ''
+        this.copyId = copyId
+        this.operateType = copyId ? 'COPY' : 'ADD'
+        uni.setNavigationBarTitle({
+            title: copyId ? '复制外贸未锁规合同' : '新增外贸未锁规合同'
+        })
+    },
     created() {
     created() {
         this.loadSuppliers()
         this.loadSuppliers()
         this.loadExtraOptions()
         this.loadExtraOptions()
         this.initCode()
         this.initCode()
         this.getDept()
         this.getDept()
         this.loadRegionOptions()
         this.loadRegionOptions()
-        this.form.orderDate = this.formatDate(new Date())
+        if (!this.copyId) this.form.orderDate = this.formatDate(new Date())
+        if (this.copyId) this.loadCopyDetail(this.copyId)
         this.$nextTick(() => {
         this.$nextTick(() => {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
                 this.initDestinationLabel()
                 this.initDestinationLabel()
@@ -350,6 +361,83 @@ export default {
         },
         },
     },
     },
     methods: {
     methods: {
+        async loadCopyDetail(id) {
+            const rid = (id !== undefined && id !== null) ? String(id) : ''
+            if (!rid) return
+            try {
+                const res = await getContractApi(rid)
+                const data = res && res.data ? res.data : {}
+                const includesPackagingFeeName = data.includesPackagingFeeName || (data.includesPackagingFee ? '是' : '否')
+                const includesTransportFeeName = data.includesTransportFeeName || (data.includesTransportFee ? '是' : '否')
+                const m = { ...data, includesPackagingFeeName, includesTransportFeeName }
+
+                const code = this.form.code
+                this.form = {
+                    ...this.form,
+                    supplier: m.supplier || '',
+                    supplierName: m.supplierName || '',
+                    buyer: m.buyer || (m.customer && m.customer.id) || '',
+                    buyerName: m.buyerName || (m.customer && m.customer.name) || '',
+                    stockUpCompanyId: m.stockUpCompanyId || '',
+                    stockUpCompanyName: m.stockUpCompanyName || '',
+                    deptName: m.deptName || this.form.deptName,
+                    deptId: m.deptId || this.form.deptId,
+                    region: m.region || '',
+                    regionName: m.regionName || '',
+                    orderDate: m.orderDate || this.form.orderDate,
+                    deliveryDate: m.deliveryDate || '',
+                    designatedConsignee: m.designatedConsignee || '',
+                    specialTerms: m.specialTerms || '',
+                    specialTermsName: m.specialTermsName || '',
+                    executionStandard: m.executionStandard || '',
+                    executionStandardName: m.executionStandardName || '',
+                    executionStandardRemarks: m.executionStandardRemarks || '',
+                    includesPackagingFee: !!m.includesPackagingFee,
+                    includesPackagingFeeName,
+                    includesTransportFee: !!m.includesTransportFee,
+                    includesTransportFeeName,
+                    unit: m.unit || this.form.unit,
+                    totalAmountCapital: m.totalAmountCapital || '',
+                    depositInfo: m.depositInfo || '',
+                    packagingRequirements: m.packagingRequirements || '',
+                    paymentTerms: m.paymentTerms || '',
+                    transportMode: m.transportMode || '',
+                    destinationId: (m.provinceId && m.cityId && m.districtId) ? [m.provinceId, m.cityId, m.districtId] : (Array.isArray(m.destinationId) ? m.destinationId : []),
+                    destinationLabel: (m.provinceName && m.cityName && m.districtName) ? `${m.provinceName} / ${m.cityName} / ${m.districtName}` : (m.destinationLabel || ''),
+                    specialInstructions: m.specialInstructions || '',
+                    remarks: m.remarks || '',
+                    pieceWeightHead: m.pieceWeightHead || '',
+                    surface: m.surface || '',
+                    tolerance: m.tolerance || '',
+                    performance: m.performance || '',
+                    component: m.component || '',
+                    packaging: m.packaging || '',
+                    workshopId: m.workshopId || '',
+                    workshopIdName: m.workshopName || m.workshopIdName || '',
+                    code,
+                }
+
+                const lines = Array.isArray(m.contractDistributorLineList) ? m.contractDistributorLineList : []
+                await this.$nextTick()
+                const comp = this.$refs.productRel
+                if (comp && typeof comp.defaultItem === 'function') {
+                    const nextItems = (lines.length ? lines : [{}]).map(x => ({
+                        ...comp.defaultItem(),
+                        ...x,
+                        sampleOrder: !!x.sampleOrder,
+                        collapsed: true
+                    }))
+                    if (!lines.length && nextItems[0]) nextItems[0].collapsed = false
+                    comp.items = nextItems
+                    if (typeof comp.recalculateAll === 'function') comp.recalculateAll()
+                    if (typeof comp.emitChange === 'function') comp.emitChange()
+                } else {
+                    this.onProductsChange(lines)
+                }
+            } catch (e) {
+                uni.showToast({ title: '复制失败，请稍后重试', icon: 'none' })
+            }
+        },
         async loadRegionOptions() {
         async loadRegionOptions() {
             try {
             try {
                 const res = await getArea()
                 const res = await getArea()
@@ -556,8 +644,9 @@ export default {
         async onSubmit() {
         async onSubmit() {
             if (this.$refs.productRel && !this.$refs.productRel.validate()) return
             if (this.$refs.productRel && !this.$refs.productRel.validate()) return
             if (!this.validateRequired()) return
             if (!this.validateRequired()) return
+            const isCopy = !!this.copyId
             const confirmRes = await new Promise(resolve => {
             const confirmRes = await new Promise(resolve => {
-                uni.showModal({ title: '提示', content: '确定新增外贸未锁规合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
+                uni.showModal({ title: '提示', content: isCopy ? '确定复制外贸未锁规合同吗？' : '确定新增外贸未锁规合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
             })
             })
             if (!(confirmRes && confirmRes.confirm)) return
             if (!(confirmRes && confirmRes.confirm)) return
             const clean = (obj) => {
             const clean = (obj) => {
@@ -577,6 +666,7 @@ export default {
             const destination = destinationId && destinationId.length > 0 ? destinationId[destinationId.length - 1] : '';
             const destination = destinationId && destinationId.length > 0 ? destinationId[destinationId.length - 1] : '';
             const payload = clean({
             const payload = clean({
                 ...formForSubmit,
                 ...formForSubmit,
+                operateType: isCopy ? 'COPY' : 'ADD',
                 destination,
                 destination,
                 type: 'INTL_OPEN_SPEC_AGMT',
                 type: 'INTL_OPEN_SPEC_AGMT',
                 totalQuantity: this.totalQuantity,
                 totalQuantity: this.totalQuantity,
@@ -588,10 +678,10 @@ export default {
             
             
             try {
             try {
                 await createContractApi(payload)
                 await createContractApi(payload)
-                uni.showToast({ title: '新增成功', icon: 'none' })
+                uni.showToast({ title: isCopy ? '复制成功' : '新增成功', icon: 'none' })
                 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_foreign_unplan/index' }) }, 400)
                 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_foreign_unplan/index' }) }, 400)
             } catch (e) {
             } catch (e) {
-                uni.showToast({ title: e.msg ||'新增失败', icon: 'none' })
+                uni.showToast({ title: e.msg || (isCopy ? '复制失败' : '新增失败'), icon: 'none' })
             }
             }
         },
         },
         validateRequired() {
         validateRequired() {

@@ -285,6 +285,12 @@ export default {
                 variant: 'outline',
                 variant: 'outline',
                 event: 'uploadSeal'
                 event: 'uploadSeal'
             },
             },
+            {
+                text: '复制',
+                visible: true,
+                variant: 'outline',
+                event: 'copy'
+            },
             ],
             ],
         }
         }
     },
     },
@@ -311,6 +317,7 @@ export default {
                 { ...this.buttons[7], visible: (s === 'FORMAL' && e && a === 'AUDIT' && this.$auth.hasPermi('contract-manage:foreign-trade-unlocked-contract:approve')) }, //审核正式合同
                 { ...this.buttons[7], visible: (s === 'FORMAL' && e && a === 'AUDIT' && this.$auth.hasPermi('contract-manage:foreign-trade-unlocked-contract:approve')) }, //审核正式合同
                 { ...this.buttons[8], visible: (s === 'STANDARD' && e && a === 'AUDIT' && this.$auth.hasPermi('contract-manage:foreign-trade-unlocked-contract:approve')) }, //审核正式合同
                 { ...this.buttons[8], visible: (s === 'STANDARD' && e && a === 'AUDIT' && this.$auth.hasPermi('contract-manage:foreign-trade-unlocked-contract:approve')) }, //审核正式合同
                 { ...this.buttons[9], visible: (s === 'STANDARD' && f && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:foreign-trade-unlocked-contract:standard-approve')) },         //审核标准合同
                 { ...this.buttons[9], visible: (s === 'STANDARD' && f && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:foreign-trade-unlocked-contract:standard-approve')) },         //审核标准合同
+                { ...this.buttons[14], visible: (s !== 'DELETED' && this.$auth.hasPermi('contract-manage:foreign-trade-unlocked-contract:copy')) },
             ]
             ]
         }
         }
     },
     },
@@ -466,6 +473,20 @@ export default {
             if (e === 'auditDetail2') return this.onAuditDetail(this.detail.parentId || '', 'FORMAL_CONTRACT')
             if (e === 'auditDetail2') return this.onAuditDetail(this.detail.parentId || '', 'FORMAL_CONTRACT')
             if (e === 'auditDetail3') return this.onAuditDetail(this.detail.id || '', 'STANDARD_CONTRACT')
             if (e === 'auditDetail3') return this.onAuditDetail(this.detail.id || '', 'STANDARD_CONTRACT')
             if (e === 'uploadSeal') return this.uploadContract(this.detail.id || '', 'seal')
             if (e === 'uploadSeal') return this.uploadContract(this.detail.id || '', 'seal')
+            if (e === 'copy') return this.onCopy(btn && btn.params)
+        },
+        getBusinessId() {
+            return (this.detail && (this.detail.id || this.detail.code)) || ''
+        },
+        onCopy() {
+            const id = this.getBusinessId()
+            if (!id) {
+                uni.showToast({ title: '未获取到合同ID，无法复制', icon: 'none' })
+                return
+            }
+            uni.navigateTo({
+                url: '/pages/contract_foreign_unplan/add?copyId=' + encodeURIComponent(id)
+            })
         },
         },
         onAudit(id, type) {
         onAudit(id, type) {
             const CACHE_KEY = 'sourceBusinessId'
             const CACHE_KEY = 'sourceBusinessId'
@@ -667,4 +688,4 @@ export default {
 .upload-row {
 .upload-row {
     margin-top: 20rpx;
     margin-top: 20rpx;
 }
 }
-</style>
+</style>

@@ -2,7 +2,7 @@
     <view class="page">
     <view class="page">
         <scroll-view class="scroll" scroll-y>
         <scroll-view class="scroll" scroll-y>
             <view class="lock-page">
             <view class="lock-page">
-                <view class="block" v-for="(item, idx) in items" :key="idx">
+                <view class="block" v-for="(item, idx) in items" :key="item.raw && (item.raw.id || item.raw.lineId || item.raw.productId) || ('row-' + idx)">
                     <view class="block-header">
                     <view class="block-header">
                         <uni-data-checkbox multiple mode="default" :localdata="[{ text: '锁规', value: 'LOCKED' }]"
                         <uni-data-checkbox multiple mode="default" :localdata="[{ text: '锁规', value: 'LOCKED' }]"
                             :modelValue="item.locked ? ['LOCKED'] : []" @change="onLockChange(idx, $event)" />
                             :modelValue="item.locked ? ['LOCKED'] : []" @change="onLockChange(idx, $event)" />
@@ -14,73 +14,79 @@
                     </view>
                     </view>
 
 
                     <uni-list v-show="item.collapsed">
                     <uni-list v-show="item.collapsed">
-                        <uni-list-item title="产品名称">
-                            <template v-slot:footer>
-                                <uni-easyinput v-model="item.productName" placeholder="请输入产品名称" :clearable="false"
-                                    disabled />
+                        <uni-list-item class="select-item" :class="item.productName ? 'is-filled' : 'is-empty'" clickable @click="openProductSheet(idx, 'product')" :rightText="item.productName || '请选择产品名称'" showArrow>
+                            <template v-slot:body>
+                                <view class="item-title"><text>产品名称</text></view>
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="行业">
                         <uni-list-item title="行业">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput v-model="item.industry" placeholder="请输入行业" :clearable="false"
-                                    disabled />
+                                <uni-easyinput v-model="item.industry" placeholder="请输入行业" />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="牌号">
                         <uni-list-item title="牌号">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput v-model="item.brand" placeholder="请输入牌号" :clearable="false" disabled />
+                                <uni-easyinput v-model="item.brand" placeholder="请输入牌号" />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="品质">
                         <uni-list-item title="品质">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput v-model="item.quality" placeholder="请输入品质" :clearable="false" disabled />
+                                <uni-easyinput v-model="item.quality" placeholder="请输入品质" />
+                            </template>
+                        </uni-list-item>
+                        <uni-list-item title="厚度(mm)">
+                            <template v-slot:footer>
+                                <uni-easyinput type="digit" v-model="item.thickness" :inputBorder="false" placeholder="请输入厚度" @input="onNonNegativeInput(idx, 'thickness')" @blur="onNonNegativeBlur(idx, 'thickness', 9)" />
+                            </template>
+                        </uni-list-item>
+                        <uni-list-item title="厚度公差上限(mm)">
+                            <template v-slot:footer>
+                                <uni-easyinput type="digit" v-model="item.thicknessTolPos" :inputBorder="false" placeholder="请输入厚度公差上限" @input="onNumberInput(idx, 'thicknessTolPos')" @blur="onNumberBlur(idx, 'thicknessTolPos', 9)" />
+                            </template>
+                        </uni-list-item>
+                        <uni-list-item title="厚度公差下限(mm)">
+                            <template v-slot:footer>
+                                <uni-easyinput type="digit" v-model="item.thicknessTolNeg" :inputBorder="false" placeholder="请输入厚度公差下限" @input="onNumberInput(idx, 'thicknessTolNeg')" @blur="onNumberBlur(idx, 'thicknessTolNeg', 9)" />
+                            </template>
+                        </uni-list-item>
+                        <uni-list-item title="宽度(mm)">
+                            <template v-slot:footer>
+                                <uni-easyinput type="digit" v-model="item.width" :inputBorder="false" placeholder="请输入宽度" @input="onNonNegativeInput(idx, 'width')" @blur="onNonNegativeBlur(idx, 'width', 9)" />
+                            </template>
+                        </uni-list-item>
+                        <uni-list-item title="宽度公差上限(mm)">
+                            <template v-slot:footer>
+                                <uni-easyinput type="digit" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差上限" @input="onNumberInput(idx, 'widthTolPos')" @blur="onNumberBlur(idx, 'widthTolPos', 9)" />
+                            </template>
+                        </uni-list-item>
+                        <uni-list-item title="宽度公差下限(mm)">
+                            <template v-slot:footer>
+                                <uni-easyinput type="digit" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差下限" @input="onNumberInput(idx, 'widthTolNeg')" @blur="onNumberBlur(idx, 'widthTolNeg', 9)" />
+                            </template>
+                        </uni-list-item>
+                        <uni-list-item title="长度(mm)">
+                            <template v-slot:footer>
+                                <uni-easyinput type="digit" v-model="item.length" :inputBorder="false" placeholder="请输入长度" @input="onNonNegativeInput(idx, 'length')" @blur="onNonNegativeBlur(idx, 'length', 9)" />
+                            </template>
+                        </uni-list-item>
+                        <uni-list-item title="长度公差上限(mm)">
+                            <template v-slot:footer>
+                                <uni-easyinput type="digit" v-model="item.lengthTolPos" :inputBorder="false" placeholder="请输入长度公差上限" @input="onNumberInput(idx, 'lengthTolPos')" @blur="onNumberBlur(idx, 'lengthTolPos', 9)" />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
-                        <uni-list-item title="规格(mm)">
+                        <uni-list-item title="长度公差下限(mm)">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <view class="value value-spec">
-                                    <view v-if="item.thickness" class="value-spec_val">{{ item.thickness }}</view>
-                                    <view v-if="item.thickness" class="value-spec_box">
-                                        <view v-if="item.thicknessTolPos" class="value-spec_box_1">{{
-                                            item.thicknessTolPos > 0 ? '+' + item.thicknessTolPos : item.thicknessTolPos
-                                            }}
-                                        </view>
-                                        <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{
-                                            item.thicknessTolNeg > 0 ? '+' + item.thicknessTolNeg : item.thicknessTolNeg
-                                            }}
-                                        </view>
-                                    </view>
-                                    <view v-if="item.width" class="value-spec_val p12">*</view>
-                                    <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
-                                    <view v-if="item.width" class="value-spec_box">
-                                        <view v-if="item.widthTolPos" class="value-spec_box_1">{{ item.widthTolPos > 0 ?
-                                            '+' + item.widthTolPos : item.widthTolPos }}
-                                        </view>
-                                        <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg > 0 ?
-                                            '+' + item.widthTolNeg : item.widthTolNeg }}
-                                        </view>
-                                    </view>
-                                    <view v-if="item.length" class="value-spec_val p12">*</view>
-                                    <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
-                                    <view v-if="item.length" class="value-spec_box">
-                                        <view v-if="item.lengthTolPos" class="value-spec_box_1">{{ item.lengthTolPos > 0
-                                            ? '+' + item.lengthTolPos : item.lengthTolPos }}
-                                        </view>
-                                        <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg > 0
-                                            ? '+' + item.lengthTolNeg : item.lengthTolNeg }}
-                                        </view>
-                                    </view>
-                                </view>
+                                <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false" placeholder="请输入长度公差下限" @input="onNumberInput(idx, 'lengthTolNeg')" @blur="onNumberBlur(idx, 'lengthTolNeg', 9)" />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="物料编码">
                         <uni-list-item title="物料编码">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput v-model="item.materialCode" placeholder="请输入物料编码" :clearable="false" disabled />
+                                <uni-easyinput v-model="item.materialCode" placeholder="请输入物料编码" />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="状态">
                         <uni-list-item title="状态">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput v-model="item.status" placeholder="请输入状态" :clearable="false" disabled />
+                                <uni-easyinput v-model="item.status" placeholder="请输入状态" />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="数量">
                         <uni-list-item title="数量">
@@ -104,33 +110,30 @@
                         </uni-list-item> -->
                         </uni-list-item> -->
                         <uni-list-item title="总金额">
                         <uni-list-item title="总金额">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput v-model="item.totalAmount" type="number" :inputBorder="false" disabled
-                                    placeholder="" />
+                                <uni-easyinput v-model="item.totalAmount" type="number" :inputBorder="false" disabled placeholder="" />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="发货日期">
                         <uni-list-item title="发货日期">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput v-model="item.deliveryDate" :inputBorder="false" disabled />
+                                <uni-easyinput v-model="item.deliveryDate" :inputBorder="false" />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                     </uni-list>
                     </uni-list>
 
 
                     <uni-list v-show="!item.collapsed">
                     <uni-list v-show="!item.collapsed">
-                        <uni-list-item title="产品名称">
-                            <template v-slot:footer>
-                                <uni-easyinput v-model="item.productName" placeholder="请输入产品名称" :clearable="false"
-                                    disabled />
+                        <uni-list-item class="select-item" :class="item.productName ? 'is-filled' : 'is-empty'" clickable @click="openProductSheet(idx, 'product')" :rightText="item.productName || '请选择产品名称'" showArrow>
+                            <template v-slot:body>
+                                <view class="item-title"><text>产品名称</text></view>
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="行业">
                         <uni-list-item title="行业">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput v-model="item.industry" placeholder="请输入行业" :clearable="false"
-                                    disabled />
+                                <uni-easyinput v-model="item.industry" placeholder="请输入行业" />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="牌号">
                         <uni-list-item title="牌号">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput v-model="item.brand" placeholder="请输入牌号" :clearable="false" disabled />
+                                <uni-easyinput v-model="item.brand" placeholder="请输入牌号" />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                         
                         
@@ -170,24 +173,36 @@
                 </view>
                 </view>
             </view>
             </view>
         </scroll-view>
         </scroll-view>
-
+        <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value" @confirm="onProductConfirm" />
     </view>
     </view>
 </template>
 </template>
 
 
 <script>
 <script>
 import { getContractApi, specificationLock } from '@/api/contract'
 import { getContractApi, specificationLock } from '@/api/contract'
+import SingleSelectSheet from '@/components/single-select/index.vue'
+import { getDicByCodes } from '@/utils/dic'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { formatCurrencyToChinese } from '@/utils/common'
 
 
 export default {
 export default {
     name: 'ContractUnplanLock',
     name: 'ContractUnplanLock',
+    components: { SingleSelectSheet },
     data() {
     data() {
         return {
         return {
             id: '',
             id: '',
             items: [],
             items: [],
             planQty: 30,
             planQty: 30,
+            sheet: { visible: false, title: '请选择', options: [], idx: -1, value: '', mode: '' },
+            options: [],
         }
         }
     },
     },
     computed: {
     computed: {
+        selectOptions() {
+            const list = Array.isArray(this.options) ? this.options : []
+            return list.map(o => ({
+                label: o.label != null ? o.label : (o.text != null ? o.text : (o.name != null ? o.name : '')),
+                value: o.value != null ? o.value : (o.id != null ? o.id : o.productId)
+            }))
+        },
         totalQuantity() {
         totalQuantity() {
             const qty = this.items.filter(it => it.locked).reduce((p, c) => p + this.toNumber(c.quantity), 0)
             const qty = this.items.filter(it => it.locked).reduce((p, c) => p + this.toNumber(c.quantity), 0)
             return this.round(qty, 2)
             return this.round(qty, 2)
@@ -219,8 +234,40 @@ export default {
         const id = options && options.id ? options.id : ''
         const id = options && options.id ? options.id : ''
         this.id = id
         this.id = id
         this.loadDetail()
         this.loadDetail()
+        this.loadProductOptions()
     },
     },
     methods: {
     methods: {
+        onNonNegativeInput(idx, field) {
+            const it = this.items[idx]
+            if (!it) return
+            const raw = it[field]
+            it[field] = String(raw || '').replace(/[^0-9.]/g, '')
+            this.$set(this.items, idx, it)
+        },
+        onNumberInput(idx, field) {
+            const it = this.items[idx]
+            if (!it) return
+            const raw = it[field]
+            it[field] = String(raw || '').replace(/[^0-9.\-]/g, '')
+            this.$set(this.items, idx, it)
+        },
+        onNonNegativeBlur(idx, field, digits) {
+            const it = this.items[idx]
+            if (!it) return
+            const num = Math.max(0, this.toNumber(it[field]))
+            const rounded = this.round(num, digits)
+            it[field] = rounded
+            this.$set(this.items, idx, it)
+        },
+        async loadProductOptions() {
+            try {
+                const results = await getDicByCodes(['CONTRACT_PRODUCT'])
+                const c3 = results && results.CONTRACT_PRODUCT && results.CONTRACT_PRODUCT.data ? results.CONTRACT_PRODUCT.data : []
+                this.options = c3.map(it => ({ label: it.name, value: it.code }))
+            } catch (e) {
+                this.options = []
+            }
+        },
         onLockChange(idx, e) {
         onLockChange(idx, e) {
             const it = this.items[idx]
             const it = this.items[idx]
             if (!it) return
             if (!it) return
@@ -238,6 +285,7 @@ export default {
                     locked: false,
                     locked: false,
                     collapsed: true,
                     collapsed: true,
                     raw: v,
                     raw: v,
+                    productId: v.productId || v.rawProductId || '',
                     productName: v.rawProductName || v.productName || '',
                     productName: v.rawProductName || v.productName || '',
                     industry: v.industry || '',
                     industry: v.industry || '',
                     brand: v.rawProductGrade || v.brand || '',
                     brand: v.rawProductGrade || v.brand || '',
@@ -272,6 +320,31 @@ export default {
             it.collapsed = !it.collapsed
             it.collapsed = !it.collapsed
             this.$set(this.items, idx, it)
             this.$set(this.items, idx, it)
         },
         },
+        openProductSheet(idx, mode = 'product') {
+            let opts = []
+            let title = ''
+            let value = ''
+            const item = this.items[idx]
+            if (mode === 'product') {
+                opts = this.selectOptions
+                const current = item && item.productId
+                const match = opts.find(o => o.value === current)
+                value = match ? match.value : ''
+                title = '请选择产品'
+            }
+            this.sheet = { ...this.sheet, visible: true, title, options: opts, idx, value, mode }
+        },
+        onProductConfirm({ value, label }) {
+            const { idx, mode } = this.sheet
+            const it = this.items[idx]
+            if (!it) { this.sheet.visible = false; return }
+            if (mode === 'product') {
+                it.productId = value
+                it.productName = label || ''
+            }
+            this.$set(this.items, idx, it)
+            this.sheet.visible = false
+        },
         onImmediateChange(idx) {
         onImmediateChange(idx) {
             this.$nextTick(() => this.recalculate(idx))
             this.$nextTick(() => this.recalculate(idx))
         },
         },
@@ -349,6 +422,26 @@ export default {
                 raw.unitPrice = price
                 raw.unitPrice = price
                 raw.totalAmount = total
                 raw.totalAmount = total
                 // raw.amountExcludingTax = excl
                 // raw.amountExcludingTax = excl
+                raw.productId = it.productId || raw.productId
+                raw.productName = it.productName
+                if (Object.prototype.hasOwnProperty.call(raw, 'rawProductId')) raw.rawProductId = it.productId || raw.rawProductId
+                if (Object.prototype.hasOwnProperty.call(raw, 'rawProductName')) raw.rawProductName = it.productName
+                raw.industry = it.industry
+                raw.quality = it.quality
+                raw.brand = it.brand
+                if (Object.prototype.hasOwnProperty.call(raw, 'rawProductGrade')) raw.rawProductGrade = it.brand
+                raw.thickness = it.thickness
+                raw.thicknessTolPos = it.thicknessTolPos
+                raw.thicknessTolNeg = it.thicknessTolNeg
+                raw.width = it.width
+                raw.widthTolPos = it.widthTolPos
+                raw.widthTolNeg = it.widthTolNeg
+                raw.length = it.length
+                raw.lengthTolPos = it.lengthTolPos
+                raw.lengthTolNeg = it.lengthTolNeg
+                raw.materialCode = it.materialCode
+                raw.status = it.status
+                raw.deliveryDate = it.deliveryDate
                 return raw
                 return raw
             })
             })
             if (!selected.length) {
             if (!selected.length) {
@@ -785,4 +878,4 @@ export default {
     height: 60rpx;
     height: 60rpx;
     align-items: center;
     align-items: center;
 }
 }
-</style>
+</style>

@@ -231,7 +231,7 @@ import SingleSelectSheet from '@/components/single-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
 import ProductRel from './productRel.vue'
 import ProductRel from './productRel.vue'
 import CitySelector from '@/components/city-selector/index.vue'
 import CitySelector from '@/components/city-selector/index.vue'
-import { getRetailCodeApi, createContractApi, getCustomerRemarks,getCustomerSpecificQualityRequirements, getDeptApi } from '@/api/contract'
+import { getRetailCodeApi, createContractApi, getCustomerRemarks, getCustomerSpecificQualityRequirements, getDeptApi, getContractApi } from '@/api/contract'
 import { getDicByCodes } from '@/utils/dic'
 import { getDicByCodes } from '@/utils/dic'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { workshopQueryApi } from '@/api/devManage'
 import { workshopQueryApi } from '@/api/devManage'
@@ -242,6 +242,8 @@ export default {
     components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector },
     components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector },
     data() {
     data() {
         return {
         return {
+            copyId: '',
+            operateType: 'ADD',
             form: {
             form: {
                 code: '',
                 code: '',
                 supplier: '',
                 supplier: '',
@@ -299,13 +301,22 @@ export default {
             rawProductGradeList: [],
             rawProductGradeList: [],
         }
         }
     },
     },
+    onLoad(query) {
+        const copyId = (query && query.copyId) ? String(query.copyId) : ''
+        this.copyId = copyId
+        this.operateType = copyId ? 'COPY' : 'ADD'
+        uni.setNavigationBarTitle({
+            title: copyId ? '复制加工标准合同' : '新增加工标准合同'
+        })
+    },
     created() {
     created() {
         this.loadSuppliers()
         this.loadSuppliers()
         this.loadExtraOptions()
         this.loadExtraOptions()
         this.initCode()
         this.initCode()
         this.getDept()
         this.getDept()
         this.loadRegionOptions()
         this.loadRegionOptions()
-        this.form.orderDate = this.formatDate(new Date())
+        if (!this.copyId) this.form.orderDate = this.formatDate(new Date())
+        if (this.copyId) this.loadCopyDetail(this.copyId)
         this.$nextTick(() => {
         this.$nextTick(() => {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
                 this.initDestinationLabel()
                 this.initDestinationLabel()
@@ -353,6 +364,83 @@ export default {
         },
         },
     },
     },
     methods: {
     methods: {
+        async loadCopyDetail(id) {
+            const rid = (id !== undefined && id !== null) ? String(id) : ''
+            if (!rid) return
+            try {
+                const res = await getContractApi(rid)
+                const data = res && res.data ? res.data : {}
+                const includesPackagingFeeName = data.includesPackagingFeeName || (data.includesPackagingFee ? '是' : '否')
+                const includesTransportFeeName = data.includesTransportFeeName || (data.includesTransportFee ? '是' : '否')
+                const m = { ...data, includesPackagingFeeName, includesTransportFeeName }
+
+                const code = this.form.code
+                this.form = {
+                    ...this.form,
+                    supplier: m.supplier || '',
+                    supplierName: m.supplierName || '',
+                    buyer: m.buyer || (m.customer && m.customer.id) || '',
+                    buyerName: m.buyerName || (m.customer && m.customer.name) || '',
+                    stockUpCompanyId: m.stockUpCompanyId || '',
+                    stockUpCompanyName: m.stockUpCompanyName || '',
+                    orderDate: m.orderDate || this.form.orderDate,
+                    deliveryDate: m.deliveryDate || '',
+                    designatedConsignee: m.designatedConsignee || '',
+                    specialTerms: m.specialTerms || '',
+                    specialTermsName: m.specialTermsName || '',
+                    executionStandard: m.executionStandard || '',
+                    executionStandardName: m.executionStandardName || '',
+                    executionStandardRemarks: m.executionStandardRemarks || '',
+                    includesPackagingFee: !!m.includesPackagingFee,
+                    includesPackagingFeeName,
+                    includesTransportFee: !!m.includesTransportFee,
+                    includesTransportFeeName,
+                    unit: m.unit || this.form.unit,
+                    totalAmountCapital: m.totalAmountCapital || '',
+                    depositInfo: m.depositInfo || '',
+                    packagingRequirements: m.packagingRequirements || '',
+                    paymentTerms: m.paymentTerms || '',
+                    transportMode: m.transportMode || '',
+                    destinationId: (m.provinceId && m.cityId && m.districtId) ? [m.provinceId, m.cityId, m.districtId] : (Array.isArray(m.destinationId) ? m.destinationId : []),
+                    destinationLabel: (m.provinceName && m.cityName && m.districtName) ? `${m.provinceName} / ${m.cityName} / ${m.districtName}` : (m.destinationLabel || ''),
+                    specialInstructions: m.specialInstructions || '',
+                    remarks: m.remarks || '',
+                    pieceWeightHead: m.pieceWeightHead || '',
+                    surface: m.surface || '',
+                    tolerance: m.tolerance || '',
+                    performance: m.performance || '',
+                    component: m.component || '',
+                    packaging: m.packaging || '',
+                    workshopId: m.workshopId || '',
+                    workshopIdName: m.workshopName || m.workshopIdName || '',
+                    region: m.region || '',
+                    regionName: m.regionName || '',
+                    deptName: m.deptName || this.form.deptName,
+                    deptId: m.deptId || this.form.deptId,
+                    code,
+                }
+
+                const lines = Array.isArray(m.contractStdProcessingLineList) ? m.contractStdProcessingLineList : []
+                await this.$nextTick()
+                const comp = this.$refs.productRel
+                if (comp && typeof comp.defaultItem === 'function') {
+                    const nextItems = (lines.length ? lines : [{}]).map(x => ({
+                        ...comp.defaultItem(),
+                        ...x,
+                        sampleOrder: !!x.sampleOrder,
+                        collapsed: true
+                    }))
+                    if (!lines.length && nextItems[0]) nextItems[0].collapsed = false
+                    comp.items = nextItems
+                    if (typeof comp.recalculateAll === 'function') comp.recalculateAll()
+                    if (typeof comp.emitChange === 'function') comp.emitChange()
+                } else {
+                    this.onProductsChange(lines)
+                }
+            } catch (e) {
+                uni.showToast({ title: '复制失败，请稍后重试', icon: 'none' })
+            }
+        },
         async loadRegionOptions() {
         async loadRegionOptions() {
             try {
             try {
                 const res = await getArea()
                 const res = await getArea()
@@ -567,8 +655,9 @@ export default {
         },
         },
         async onSubmit() {
         async onSubmit() {
             if (!this.validateRequired()) return
             if (!this.validateRequired()) return
+            const isCopy = !!this.copyId
             const confirmRes = await new Promise(resolve => {
             const confirmRes = await new Promise(resolve => {
-                uni.showModal({ title: '提示', content: '确定新增加工标准合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
+                uni.showModal({ title: '提示', content: isCopy ? '确定复制加工标准合同吗？' : '确定新增加工标准合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
             })
             })
             if (!(confirmRes && confirmRes.confirm)) return
             if (!(confirmRes && confirmRes.confirm)) return
             const clean = (obj) => {
             const clean = (obj) => {
@@ -588,6 +677,7 @@ export default {
             const destination = destinationId && destinationId.length > 0 ? destinationId[destinationId.length - 1] : '';
             const destination = destinationId && destinationId.length > 0 ? destinationId[destinationId.length - 1] : '';
             const payload = clean({
             const payload = clean({
                 ...formForSubmit,
                 ...formForSubmit,
+                operateType: isCopy ? 'COPY' : 'ADD',
                 destination,
                 destination,
                 type: 'PROCESS_STD_AGMT',
                 type: 'PROCESS_STD_AGMT',
                 totalQuantity: this.totalQuantity,
                 totalQuantity: this.totalQuantity,
@@ -601,10 +691,10 @@ export default {
             
             
             try {
             try {
                 await createContractApi(payload)
                 await createContractApi(payload)
-                uni.showToast({ title: '新增成功', icon: 'none' })
+                uni.showToast({ title: isCopy ? '复制成功' : '新增成功', icon: 'none' })
                 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_process/index' }) }, 400)
                 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_process/index' }) }, 400)
             } catch (e) {
             } catch (e) {
-                uni.showToast({ title: e.msg ||'新增失败', icon: 'none' })
+                uni.showToast({ title: e.msg || (isCopy ? '复制失败' : '新增失败'), icon: 'none' })
             }
             }
         },
         },
         validateRequired() {
         validateRequired() {

@@ -210,6 +210,12 @@ export default {
             visible: true,
             visible: true,
             event: 'auditDetail'
             event: 'auditDetail'
           },
           },
+          {
+            text: '复制',
+            visible: true,
+            variant: 'outline',
+            event: 'copy'
+          },
         ],
         ],
         }
         }
     },
     },
@@ -224,6 +230,7 @@ export default {
           { ...this.buttons[2], visible: (s !== 'DELETED' && t !== 'AUDIT' && t !== 'PASS' && this.$auth.hasPermi('contract-manage:processed-standard-contract:upload')) },
           { ...this.buttons[2], visible: (s !== 'DELETED' && t !== 'AUDIT' && t !== 'PASS' && this.$auth.hasPermi('contract-manage:processed-standard-contract:upload')) },
           { ...this.buttons[4], visible: (s === 'STANDARD' && this.$auth.hasPermi('contract-manage:processed-standard-contract:review')) },
           { ...this.buttons[4], visible: (s === 'STANDARD' && this.$auth.hasPermi('contract-manage:processed-standard-contract:review')) },
           { ...this.buttons[3], visible: (s === 'STANDARD' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:processed-standard-contract:approve')) },
           { ...this.buttons[3], visible: (s === 'STANDARD' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:processed-standard-contract:approve')) },
+          { ...this.buttons[5], visible: (s !== 'DELETED' && this.$auth.hasPermi('contract-manage:processed-standard-contract:copy')) },
         ]
         ]
       }
       }
     },
     },
@@ -346,6 +353,20 @@ export default {
             if (e === 'upload') return this.uploadContract(this.detail.id || '')
             if (e === 'upload') return this.uploadContract(this.detail.id || '')
             if (e === 'audit') return this.onAudit(this.detail.id || '', 'PROCESS_STD_AGMT')
             if (e === 'audit') return this.onAudit(this.detail.id || '', 'PROCESS_STD_AGMT')
             if (e === 'auditDetail') return this.onAuditDetail(this.detail.id || '', 'PROCESS_STD_AGMT')
             if (e === 'auditDetail') return this.onAuditDetail(this.detail.id || '', 'PROCESS_STD_AGMT')
+            if (e === 'copy') return this.onCopy(btn && btn.params)
+        },
+        getBusinessId() {
+            return (this.detail && (this.detail.id || this.detail.code)) || ''
+        },
+        onCopy() {
+            const id = this.getBusinessId()
+            if (!id) {
+                uni.showToast({ title: '未获取到合同ID，无法复制', icon: 'none' })
+                return
+            }
+            uni.navigateTo({
+                url: '/pages/contract_process/add?copyId=' + encodeURIComponent(id)
+            })
         },
         },
         onAudit(id, type) {
         onAudit(id, type) {
             const CACHE_KEY = 'sourceBusinessId'
             const CACHE_KEY = 'sourceBusinessId'
@@ -533,4 +554,4 @@ export default {
 .upload-row {
 .upload-row {
     margin-top: 20rpx;
     margin-top: 20rpx;
 }
 }
-</style>
+</style>

@@ -227,7 +227,7 @@ import SingleSelectSheet from '@/components/single-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
 import ProductRel from './productRel.vue'
 import ProductRel from './productRel.vue'
 import CitySelector from '@/components/city-selector/index.vue'
 import CitySelector from '@/components/city-selector/index.vue'
-import { getRetailCodeApi, createContractApi, getCustomerRemarks,getCustomerSpecificQualityRequirements, getDeptApi } from '@/api/contract'
+import { getRetailCodeApi, createContractApi, getCustomerRemarks, getCustomerSpecificQualityRequirements, getDeptApi, getContractApi } from '@/api/contract'
 import { getDicByCodes } from '@/utils/dic'
 import { getDicByCodes } from '@/utils/dic'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { workshopQueryApi } from '@/api/devManage'
 import { workshopQueryApi } from '@/api/devManage'
@@ -238,6 +238,8 @@ export default {
     components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector },
     components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector },
     data() {
     data() {
         return {
         return {
+            copyId: '',
+            operateType: 'ADD',
             form: {
             form: {
                 code: '',
                 code: '',
                 supplier: '',
                 supplier: '',
@@ -292,13 +294,22 @@ export default {
             regionOptions: [],
             regionOptions: [],
         }
         }
     },
     },
+    onLoad(query) {
+        const copyId = (query && query.copyId) ? String(query.copyId) : ''
+        this.copyId = copyId
+        this.operateType = copyId ? 'COPY' : 'ADD'
+        uni.setNavigationBarTitle({
+            title: copyId ? '复制经销标准合同' : '新增经销标准合同'
+        })
+    },
     created() {
     created() {
         this.loadSuppliers()
         this.loadSuppliers()
         this.loadExtraOptions()
         this.loadExtraOptions()
         this.initCode()
         this.initCode()
         this.getDept()
         this.getDept()
         this.loadRegionOptions()
         this.loadRegionOptions()
-        this.form.orderDate = this.formatDate(new Date())
+        if (!this.copyId) this.form.orderDate = this.formatDate(new Date())
+        if (this.copyId) this.loadCopyDetail(this.copyId)
         this.$nextTick(() => {
         this.$nextTick(() => {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
                 this.initDestinationLabel()
                 this.initDestinationLabel()
@@ -347,6 +358,83 @@ export default {
         },
         },
     },
     },
     methods: {
     methods: {
+        async loadCopyDetail(id) {
+            const rid = (id !== undefined && id !== null) ? String(id) : ''
+            if (!rid) return
+            try {
+                const res = await getContractApi(rid)
+                const data = res && res.data ? res.data : {}
+                const includesPackagingFeeName = data.includesPackagingFeeName || (data.includesPackagingFee ? '是' : '否')
+                const includesTransportFeeName = data.includesTransportFeeName || (data.includesTransportFee ? '是' : '否')
+                const m = { ...data, includesPackagingFeeName, includesTransportFeeName }
+
+                const code = this.form.code
+                this.form = {
+                    ...this.form,
+                    supplier: m.supplier || '',
+                    supplierName: m.supplierName || '',
+                    buyer: m.buyer || (m.customer && m.customer.id) || '',
+                    buyerName: m.buyerName || (m.customer && m.customer.name) || '',
+                    orderDate: m.orderDate || this.form.orderDate,
+                    deliveryDate: m.deliveryDate || '',
+                    designatedConsignee: m.designatedConsignee || '',
+                    specialTerms: m.specialTerms || '',
+                    specialTermsName: m.specialTermsName || '',
+                    executionStandard: m.executionStandard || '',
+                    executionStandardName: m.executionStandardName || '',
+                    executionStandardRemarks: m.executionStandardRemarks || '',
+                    includesPackagingFee: !!m.includesPackagingFee,
+                    includesPackagingFeeName,
+                    includesTransportFee: !!m.includesTransportFee,
+                    includesTransportFeeName,
+                    unit: m.unit || this.form.unit,
+                    totalAmountCapital: m.totalAmountCapital || '',
+                    depositInfo: m.depositInfo || '',
+                    packagingRequirements: m.packagingRequirements || '',
+                    paymentTerms: m.paymentTerms || '',
+                    transportMode: m.transportMode || '',
+                    destinationId: (m.provinceId && m.cityId && m.districtId) ? [m.provinceId, m.cityId, m.districtId] : (Array.isArray(m.destinationId) ? m.destinationId : []),
+                    destinationLabel: (m.provinceName && m.cityName && m.districtName) ? `${m.provinceName} / ${m.cityName} / ${m.districtName}` : (m.destinationLabel || ''),
+                    specialInstructions: m.specialInstructions || '',
+                    remarks: m.remarks || '',
+                    pieceWeightHead: m.pieceWeightHead || '',
+                    surface: m.surface || '',
+                    tolerance: m.tolerance || '',
+                    performance: m.performance || '',
+                    component: m.component || '',
+                    packaging: m.packaging || '',
+                    workshopId: m.workshopId || '',
+                    workshopIdName: m.workshopName || m.workshopIdName || '',
+                    stockUpCompanyId: m.stockUpCompanyId || '',
+                    stockUpCompanyName: m.stockUpCompanyName || '',
+                    region: m.region || '',
+                    regionName: m.regionName || '',
+                    deptName: m.deptName || this.form.deptName,
+                    deptId: m.deptId || this.form.deptId,
+                    code,
+                }
+
+                const lines = Array.isArray(m.contractDistributorLineList) ? m.contractDistributorLineList : []
+                await this.$nextTick()
+                const comp = this.$refs.productRel
+                if (comp && typeof comp.defaultItem === 'function') {
+                    const nextItems = (lines.length ? lines : [{}]).map(x => ({
+                        ...comp.defaultItem(),
+                        ...x,
+                        sampleOrder: !!x.sampleOrder,
+                        collapsed: true
+                    }))
+                    if (!lines.length && nextItems[0]) nextItems[0].collapsed = false
+                    comp.items = nextItems
+                    if (typeof comp.recalculateAll === 'function') comp.recalculateAll()
+                    if (typeof comp.emitChange === 'function') comp.emitChange()
+                } else {
+                    this.onProductsChange(lines)
+                }
+            } catch (e) {
+                uni.showToast({ title: '复制失败，请稍后重试', icon: 'none' })
+            }
+        },
         async loadRegionOptions() {
         async loadRegionOptions() {
             try {
             try {
                 const res = await getArea()
                 const res = await getArea()
@@ -552,8 +640,9 @@ export default {
         },
         },
         async onSubmit() {
         async onSubmit() {
             if (!this.validateRequired()) return
             if (!this.validateRequired()) return
+            const isCopy = !!this.copyId
             const confirmRes = await new Promise(resolve => {
             const confirmRes = await new Promise(resolve => {
-                uni.showModal({ title: '提示', content: '确定新增经销标准合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
+                uni.showModal({ title: '提示', content: isCopy ? '确定复制经销标准合同吗？' : '确定新增经销标准合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
             })
             })
             if (!(confirmRes && confirmRes.confirm)) return
             if (!(confirmRes && confirmRes.confirm)) return
             const clean = (obj) => {
             const clean = (obj) => {
@@ -573,6 +662,7 @@ export default {
             const destination = destinationId && destinationId.length > 0 ? destinationId[destinationId.length - 1] : '';
             const destination = destinationId && destinationId.length > 0 ? destinationId[destinationId.length - 1] : '';
             const payload = clean({
             const payload = clean({
                 ...formForSubmit,
                 ...formForSubmit,
+                operateType: this.copyId ? 'COPY' : 'ADD',
                 destination,
                 destination,
                 type: 'DISTRIB_STD',
                 type: 'DISTRIB_STD',
                 totalQuantity: this.totalQuantity,
                 totalQuantity: this.totalQuantity,
@@ -584,10 +674,10 @@ export default {
             
             
             try {
             try {
                 await createContractApi(payload)
                 await createContractApi(payload)
-                uni.showToast({ title: '新增成功', icon: 'none' })
+                uni.showToast({ title: isCopy ? '复制成功' : '新增成功', icon: 'none' })
                 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_retail/index' }) }, 400)
                 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_retail/index' }) }, 400)
             } catch (e) {
             } catch (e) {
-                uni.showToast({ title: e.msg ||'新增失败', icon: 'none' })
+                uni.showToast({ title: e.msg || (isCopy ? '复制失败' : '新增失败'), icon: 'none' })
             }
             }
         },
         },
         validateRequired() {
         validateRequired() {

@@ -209,6 +209,12 @@ export default {
                 visible: true,
                 visible: true,
                 event: 'auditDetail'
                 event: 'auditDetail'
             },
             },
+            {
+                text: '复制',
+                visible: true,
+                variant: 'outline',
+                event: 'copy'
+            }
             ],
             ],
             statusStyle: statusStyle,
             statusStyle: statusStyle,
             dicOptions: { AUDIT_STATUS: [] }
             dicOptions: { AUDIT_STATUS: [] }
@@ -225,6 +231,7 @@ export default {
                 { ...this.buttons[2], visible: (s !== 'DELETED' && t !== 'AUDIT' && t !== 'PASS' && this.$auth.hasPermi('contract-manage:distribution-standard-contract:upload')) },
                 { ...this.buttons[2], visible: (s !== 'DELETED' && t !== 'AUDIT' && t !== 'PASS' && this.$auth.hasPermi('contract-manage:distribution-standard-contract:upload')) },
                 { ...this.buttons[4], visible: (s === 'STANDARD' && this.$auth.hasPermi('contract-manage:distribution-standard-contract:review')) },
                 { ...this.buttons[4], visible: (s === 'STANDARD' && this.$auth.hasPermi('contract-manage:distribution-standard-contract:review')) },
                 { ...this.buttons[3], visible: (s === 'STANDARD' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-standard-contract:approve')) },
                 { ...this.buttons[3], visible: (s === 'STANDARD' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-standard-contract:approve')) },
+                { ...this.buttons[5], visible: (s !== 'DELETED' && this.$auth.hasPermi('contract-manage:distribution-standard-contract:copy')) },
             ]
             ]
         }
         }
     },
     },
@@ -363,10 +370,21 @@ export default {
             if (e === 'upload') return this.onUpload(btn && btn.params)
             if (e === 'upload') return this.onUpload(btn && btn.params)
             if (e === 'audit') return this.onAudit(btn && btn.params)
             if (e === 'audit') return this.onAudit(btn && btn.params)
             if (e === 'auditDetail') return this.onAuditDetail(btn && btn.params)
             if (e === 'auditDetail') return this.onAuditDetail(btn && btn.params)
+            if (e === 'copy') return this.onCopy(btn && btn.params)
         },
         },
         getBusinessId() {
         getBusinessId() {
             return (this.detail && (this.detail.id || this.detail.code)) || ''
             return (this.detail && (this.detail.id || this.detail.code)) || ''
         },
         },
+        onCopy() {
+            const id = this.getBusinessId()
+            if (!id) {
+                uni.showToast({ title: '未获取到合同ID，无法复制', icon: 'none' })
+                return
+            }
+            uni.navigateTo({
+                url: '/pages/contract_retail/add?copyId=' + encodeURIComponent(id)
+            })
+        },
         onAudit() {
         onAudit() {
             const CACHE_KEY = 'sourceBusinessId'
             const CACHE_KEY = 'sourceBusinessId'
             uni.setStorageSync(CACHE_KEY, this.getBusinessId())
             uni.setStorageSync(CACHE_KEY, this.getBusinessId())

@@ -225,7 +225,7 @@ import SingleSelectSheet from '@/components/single-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
 import ProductRel from './productRel.vue'
 import ProductRel from './productRel.vue'
 import CitySelector from '@/components/city-selector/index.vue'
 import CitySelector from '@/components/city-selector/index.vue'
-import { getRetailCodeApi, createContractApi,getCustomerRemarks,getCustomerSpecificQualityRequirements, getDeptApi } from '@/api/contract'
+import { getRetailCodeApi, createContractApi,getCustomerRemarks,getCustomerSpecificQualityRequirements, getDeptApi,getContractApi } from '@/api/contract'
 import { getDicByCodes } from '@/utils/dic'
 import { getDicByCodes } from '@/utils/dic'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { workshopQueryApi } from '@/api/devManage'
 import { workshopQueryApi } from '@/api/devManage'
@@ -236,6 +236,8 @@ export default {
     components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector },
     components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector },
     data() {
     data() {
         return {
         return {
+            copyId: '',
+            operateType: 'ADD',
             form: {
             form: {
                 code: '',
                 code: '',
                 supplier: '',
                 supplier: '',
@@ -290,13 +292,22 @@ export default {
             regionOptions: [],
             regionOptions: [],
         }
         }
     },
     },
+    onLoad(query) {
+        const copyId = (query && query.copyId) ? String(query.copyId) : ''
+        this.copyId = copyId
+        this.operateType = copyId ? 'COPY' : 'ADD'
+        uni.setNavigationBarTitle({
+            title: copyId ? '复制经销库存合同' : '新增经销库存合同'
+        })
+    },
     created() {
     created() {
         this.loadSuppliers()
         this.loadSuppliers()
         this.loadExtraOptions()
         this.loadExtraOptions()
         this.initCode()
         this.initCode()
         this.getDept()
         this.getDept()
         this.loadRegionOptions()
         this.loadRegionOptions()
-        this.form.orderDate = this.formatDate(new Date())
+        if (!this.copyId) this.form.orderDate = this.formatDate(new Date())
+        if (this.copyId) this.loadCopyDetail(this.copyId)
         this.$nextTick(() => {
         this.$nextTick(() => {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
                 this.initDestinationLabel()
                 this.initDestinationLabel()
@@ -344,6 +355,83 @@ export default {
         },
         },
     },
     },
     methods: {
     methods: {
+        async loadCopyDetail(id) {
+            const rid = (id !== undefined && id !== null) ? String(id) : ''
+            if (!rid) return
+            try {
+                const res = await getContractApi(rid)
+                const data = res && res.data ? res.data : {}
+                const includesPackagingFeeName = data.includesPackagingFeeName || (data.includesPackagingFee ? '是' : '否')
+                const includesTransportFeeName = data.includesTransportFeeName || (data.includesTransportFee ? '是' : '否')
+                const m = { ...data, includesPackagingFeeName, includesTransportFeeName }
+
+                const code = this.form.code
+                this.form = {
+                    ...this.form,
+                    supplier: m.supplier || '',
+                    supplierName: m.supplierName || '',
+                    buyer: m.buyer || (m.customer && m.customer.id) || '',
+                    buyerName: m.buyerName || (m.customer && m.customer.name) || '',
+                    orderDate: m.orderDate || this.form.orderDate,
+                    deliveryDate: m.deliveryDate || '',
+                    designatedConsignee: m.designatedConsignee || '',
+                    specialTerms: m.specialTerms || '',
+                    specialTermsName: m.specialTermsName || '',
+                    executionStandard: m.executionStandard || '',
+                    executionStandardName: m.executionStandardName || '',
+                    executionStandardRemarks: m.executionStandardRemarks || '',
+                    includesPackagingFee: !!m.includesPackagingFee,
+                    includesPackagingFeeName,
+                    includesTransportFee: !!m.includesTransportFee,
+                    includesTransportFeeName,
+                    unit: m.unit || this.form.unit,
+                    totalAmountCapital: m.totalAmountCapital || '',
+                    depositInfo: m.depositInfo || '',
+                    packagingRequirements: m.packagingRequirements || '',
+                    paymentTerms: m.paymentTerms || '',
+                    transportMode: m.transportMode || '',
+                    destinationId: (m.provinceId && m.cityId && m.districtId) ? [m.provinceId, m.cityId, m.districtId] : (Array.isArray(m.destinationId) ? m.destinationId : []),
+                    destinationLabel: (m.provinceName && m.cityName && m.districtName) ? `${m.provinceName} / ${m.cityName} / ${m.districtName}` : (m.destinationLabel || ''),
+                    specialInstructions: m.specialInstructions || '',
+                    remarks: m.remarks || '',
+                    pieceWeightHead: m.pieceWeightHead || '',
+                    surface: m.surface || '',
+                    tolerance: m.tolerance || '',
+                    performance: m.performance || '',
+                    component: m.component || '',
+                    packaging: m.packaging || '',
+                    workshopId: m.workshopId || '',
+                    workshopIdName: m.workshopName || m.workshopIdName || '',
+                    stockUpCompanyId: m.stockUpCompanyId || '',
+                    stockUpCompanyName: m.stockUpCompanyName || '',
+                    region: m.region || '',
+                    regionName: m.regionName || '',
+                    deptName: m.deptName || this.form.deptName,
+                    deptId: m.deptId || this.form.deptId,
+                    code,
+                }
+
+                const lines = Array.isArray(m.contractDistributorLineList) ? m.contractDistributorLineList : []
+                await this.$nextTick()
+                const comp = this.$refs.productRel
+                if (comp && typeof comp.defaultItem === 'function') {
+                    const nextItems = (lines.length ? lines : [{}]).map(x => ({
+                        ...comp.defaultItem(),
+                        ...x,
+                        sampleOrder: !!x.sampleOrder,
+                        collapsed: true
+                    }))
+                    if (!lines.length && nextItems[0]) nextItems[0].collapsed = false
+                    comp.items = nextItems
+                    if (typeof comp.recalculateAll === 'function') comp.recalculateAll()
+                    if (typeof comp.emitChange === 'function') comp.emitChange()
+                } else {
+                    this.onProductsChange(lines)
+                }
+            } catch (e) {
+                uni.showToast({ title: '复制失败，请稍后重试', icon: 'none' })
+            }
+        },
         async loadRegionOptions() {
         async loadRegionOptions() {
             try {
             try {
                 const res = await getArea()
                 const res = await getArea()
@@ -549,8 +637,9 @@ export default {
         },
         },
         async onSubmit() {
         async onSubmit() {
             if (!this.validateRequired()) return
             if (!this.validateRequired()) return
+            const isCopy = !!this.copyId
             const confirmRes = await new Promise(resolve => {
             const confirmRes = await new Promise(resolve => {
-                uni.showModal({ title: '提示', content: '确定新增经销库存合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
+                uni.showModal({ title: '提示', content: isCopy ? '确定复制经销库存合同吗？' : '确定新增经销库存合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
             })
             })
             if (!(confirmRes && confirmRes.confirm)) return
             if (!(confirmRes && confirmRes.confirm)) return
             const clean = (obj) => {
             const clean = (obj) => {
@@ -570,6 +659,7 @@ export default {
             const destination = destinationId && destinationId.length > 0 ? destinationId[destinationId.length - 1] : '';
             const destination = destinationId && destinationId.length > 0 ? destinationId[destinationId.length - 1] : '';
             const payload = clean({
             const payload = clean({
                 ...formForSubmit,
                 ...formForSubmit,
+                operateType: this.copyId ? 'COPY' : 'ADD',
                 destination,
                 destination,
                 type: 'DIST_STOCK_CONTRACT',
                 type: 'DIST_STOCK_CONTRACT',
                 totalQuantity: this.totalQuantity,
                 totalQuantity: this.totalQuantity,
@@ -581,10 +671,10 @@ export default {
             
             
             try {
             try {
                 await createContractApi(payload)
                 await createContractApi(payload)
-                uni.showToast({ title: '新增成功', icon: 'none' })
+                uni.showToast({ title: isCopy ? '复制成功' : '新增成功', icon: 'none' })
                 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_stock/index' }) }, 400)
                 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_stock/index' }) }, 400)
             } catch (e) {
             } catch (e) {
-                uni.showToast({ title: e.msg ||'新增失败', icon: 'none' })
+                uni.showToast({ title: e.msg || (isCopy ? '复制失败' : '新增失败'), icon: 'none' })
             }
             }
         },
         },
         validateRequired() {
         validateRequired() {

@@ -266,6 +266,12 @@ export default {
             visible: true,
             visible: true,
             event: 'auditDetail3'
             event: 'auditDetail3'
           },
           },
+          {
+                text: '复制',
+                visible: true,
+                variant: 'outline',
+                event: 'copy'
+            }
         ],
         ],
         uploadId: '',
         uploadId: '',
         uploadType: 'formal',
         uploadType: 'formal',
@@ -292,6 +298,7 @@ export default {
           { ...this.buttons[6], visible: (s === 'FORMAL' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:approve')) },
           { ...this.buttons[6], visible: (s === 'FORMAL' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:approve')) },
           { ...this.buttons[7], visible: (s === 'STANDARD' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:approve')) },
           { ...this.buttons[7], visible: (s === 'STANDARD' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:approve')) },
           { ...this.buttons[8], visible: (s === 'STANDARD' && f && a === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:standard-approve')) },
           { ...this.buttons[8], visible: (s === 'STANDARD' && f && a === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:standard-approve')) },
+          { ...this.buttons[12], visible: (s !== 'DELETED' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:copy')) },
         ]
         ]
       }
       }
     },
     },
@@ -426,6 +433,7 @@ export default {
             if (e === 'auditDetail1') return this.onAuditDetail(this.detail.id || '', 'FORMAL_CONTRACT')
             if (e === 'auditDetail1') return this.onAuditDetail(this.detail.id || '', 'FORMAL_CONTRACT')
             if (e === 'auditDetail2') return this.onAuditDetail(this.detail.parentId || '', 'FORMAL_CONTRACT')
             if (e === 'auditDetail2') return this.onAuditDetail(this.detail.parentId || '', 'FORMAL_CONTRACT')
             if (e === 'auditDetail3') return this.onAuditDetail(this.detail.id || '', 'STANDARD_CONTRACT')
             if (e === 'auditDetail3') return this.onAuditDetail(this.detail.id || '', 'STANDARD_CONTRACT')
+            if (e === 'copy') return this.onCopy(this.detail)
         },
         },
         onAudit(id, type) {
         onAudit(id, type) {
             const CACHE_KEY = 'sourceBusinessId'
             const CACHE_KEY = 'sourceBusinessId'
@@ -434,6 +442,11 @@ export default {
             uni.setStorageSync(CACHE_KEY, id)
             uni.setStorageSync(CACHE_KEY, id)
             uni.navigateTo({ url: '/pages/flow/audit' })
             uni.navigateTo({ url: '/pages/flow/audit' })
         },
         },
+        onCopy(params) {
+            uni.navigateTo({
+                url: '/pages/contract_stock/add?copyId=' + encodeURIComponent(params.id) || ''
+            })
+        },
         onAuditDetail(id, type) {
         onAuditDetail(id, type) {
             const CACHE_KEY = 'sourceBusinessId'
             const CACHE_KEY = 'sourceBusinessId'
             const TYPE = 'contractType'
             const TYPE = 'contractType'

@@ -227,7 +227,7 @@ import SingleSelectSheet from '@/components/single-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
 import ProductRel from './productRel.vue'
 import ProductRel from './productRel.vue'
 import CitySelector from '@/components/city-selector/index.vue'
 import CitySelector from '@/components/city-selector/index.vue'
-import { getRetailCodeApi, createContractApi, getCustomerRemarks,getCustomerSpecificQualityRequirements, getDeptApi } from '@/api/contract'
+import { getRetailCodeApi, createContractApi, getCustomerRemarks, getCustomerSpecificQualityRequirements, getDeptApi, getContractApi } from '@/api/contract'
 import { getDicByCodes } from '@/utils/dic'
 import { getDicByCodes } from '@/utils/dic'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { workshopQueryApi } from '@/api/devManage'
 import { workshopQueryApi } from '@/api/devManage'
@@ -238,6 +238,8 @@ export default {
     components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector },
     components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector },
     data() {
     data() {
         return {
         return {
+            copyId: '',
+            operateType: 'ADD',
             form: {
             form: {
                 code: '',
                 code: '',
                 supplier: '',
                 supplier: '',
@@ -292,13 +294,22 @@ export default {
             regionOptions: [],
             regionOptions: [],
         }
         }
     },
     },
+    onLoad(query) {
+        const copyId = (query && query.copyId) ? String(query.copyId) : ''
+        this.copyId = copyId
+        this.operateType = copyId ? 'COPY' : 'ADD'
+        uni.setNavigationBarTitle({
+            title: copyId ? '复制经销未锁规合同' : '新增经销未锁规合同'
+        })
+    },
     created() {
     created() {
         this.loadSuppliers()
         this.loadSuppliers()
         this.loadExtraOptions()
         this.loadExtraOptions()
         this.initCode()
         this.initCode()
         this.getDept()
         this.getDept()
         this.loadRegionOptions()
         this.loadRegionOptions()
-        this.form.orderDate = this.formatDate(new Date())
+        if (!this.copyId) this.form.orderDate = this.formatDate(new Date())
+        if (this.copyId) this.loadCopyDetail(this.copyId)
         this.$nextTick(() => {
         this.$nextTick(() => {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
                 this.initDestinationLabel()
                 this.initDestinationLabel()
@@ -348,6 +359,83 @@ export default {
         },
         },
     },
     },
     methods: {
     methods: {
+        async loadCopyDetail(id) {
+            const rid = (id !== undefined && id !== null) ? String(id) : ''
+            if (!rid) return
+            try {
+                const res = await getContractApi(rid)
+                const data = res && res.data ? res.data : {}
+                const includesPackagingFeeName = data.includesPackagingFeeName || (data.includesPackagingFee ? '是' : '否')
+                const includesTransportFeeName = data.includesTransportFeeName || (data.includesTransportFee ? '是' : '否')
+                const m = { ...data, includesPackagingFeeName, includesTransportFeeName }
+
+                const code = this.form.code
+                this.form = {
+                    ...this.form,
+                    supplier: m.supplier || '',
+                    supplierName: m.supplierName || '',
+                    buyer: m.buyer || (m.customer && m.customer.id) || '',
+                    buyerName: m.buyerName || (m.customer && m.customer.name) || '',
+                    stockUpCompanyId: m.stockUpCompanyId || '',
+                    stockUpCompanyName: m.stockUpCompanyName || '',
+                    deptName: m.deptName || this.form.deptName,
+                    deptId: m.deptId || this.form.deptId,
+                    region: m.region || '',
+                    regionName: m.regionName || '',
+                    orderDate: m.orderDate || this.form.orderDate,
+                    deliveryDate: m.deliveryDate || '',
+                    designatedConsignee: m.designatedConsignee || '',
+                    specialTerms: m.specialTerms || '',
+                    specialTermsName: m.specialTermsName || '',
+                    executionStandard: m.executionStandard || '',
+                    executionStandardName: m.executionStandardName || '',
+                    executionStandardRemarks: m.executionStandardRemarks || '',
+                    includesPackagingFee: !!m.includesPackagingFee,
+                    includesPackagingFeeName,
+                    includesTransportFee: !!m.includesTransportFee,
+                    includesTransportFeeName,
+                    unit: m.unit || this.form.unit,
+                    totalAmountCapital: m.totalAmountCapital || '',
+                    depositInfo: m.depositInfo || '',
+                    packagingRequirements: m.packagingRequirements || '',
+                    paymentTerms: m.paymentTerms || '',
+                    transportMode: m.transportMode || '',
+                    destinationId: (m.provinceId && m.cityId && m.districtId) ? [m.provinceId, m.cityId, m.districtId] : (Array.isArray(m.destinationId) ? m.destinationId : []),
+                    destinationLabel: (m.provinceName && m.cityName && m.districtName) ? `${m.provinceName} / ${m.cityName} / ${m.districtName}` : (m.destinationLabel || ''),
+                    specialInstructions: m.specialInstructions || '',
+                    remarks: m.remarks || '',
+                    pieceWeightHead: m.pieceWeightHead || '',
+                    surface: m.surface || '',
+                    tolerance: m.tolerance || '',
+                    performance: m.performance || '',
+                    component: m.component || '',
+                    packaging: m.packaging || '',
+                    workshopId: m.workshopId || '',
+                    workshopIdName: m.workshopName || m.workshopIdName || '',
+                    code,
+                }
+
+                const lines = Array.isArray(m.contractDistributorLineList) ? m.contractDistributorLineList : []
+                await this.$nextTick()
+                const comp = this.$refs.productRel
+                if (comp && typeof comp.defaultItem === 'function') {
+                    const nextItems = (lines.length ? lines : [{}]).map(x => ({
+                        ...comp.defaultItem(),
+                        ...x,
+                        sampleOrder: !!x.sampleOrder,
+                        collapsed: true
+                    }))
+                    if (!lines.length && nextItems[0]) nextItems[0].collapsed = false
+                    comp.items = nextItems
+                    if (typeof comp.recalculateAll === 'function') comp.recalculateAll()
+                    if (typeof comp.emitChange === 'function') comp.emitChange()
+                } else {
+                    this.onProductsChange(lines)
+                }
+            } catch (e) {
+                uni.showToast({ title: '复制失败，请稍后重试', icon: 'none' })
+            }
+        },
         async loadRegionOptions() {
         async loadRegionOptions() {
             try {
             try {
                 const res = await getArea()
                 const res = await getArea()
@@ -553,8 +641,9 @@ export default {
         },
         },
         async onSubmit() {
         async onSubmit() {
             if (!this.validateRequired()) return
             if (!this.validateRequired()) return
+            const isCopy = !!this.copyId
             const confirmRes = await new Promise(resolve => {
             const confirmRes = await new Promise(resolve => {
-                uni.showModal({ title: '提示', content: '确定新增经销未锁规合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
+                uni.showModal({ title: '提示', content: isCopy ? '确定复制经销未锁规合同吗？' : '确定新增经销未锁规合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
             })
             })
             if (!(confirmRes && confirmRes.confirm)) return
             if (!(confirmRes && confirmRes.confirm)) return
             const clean = (obj) => {
             const clean = (obj) => {
@@ -574,6 +663,7 @@ export default {
             const destination = destinationId && destinationId.length > 0 ? destinationId[destinationId.length - 1] : '';
             const destination = destinationId && destinationId.length > 0 ? destinationId[destinationId.length - 1] : '';
             const payload = clean({
             const payload = clean({
                 ...formForSubmit,
                 ...formForSubmit,
+                operateType: isCopy ? 'COPY' : 'ADD',
                 destination,
                 destination,
                 type: 'DRAFT_DIST_AGMT',
                 type: 'DRAFT_DIST_AGMT',
                 totalQuantity: this.totalQuantity,
                 totalQuantity: this.totalQuantity,
@@ -585,10 +675,10 @@ export default {
             
             
             try {
             try {
                 await createContractApi(payload)
                 await createContractApi(payload)
-                uni.showToast({ title: '新增成功', icon: 'none' })
+                uni.showToast({ title: isCopy ? '复制成功' : '新增成功', icon: 'none' })
                 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_unplan/index' }) }, 400)
                 setTimeout(() => { uni.redirectTo({ url: '/pages/contract_unplan/index' }) }, 400)
             } catch (e) {
             } catch (e) {
-                uni.showToast({ title: e.msg ||'新增失败', icon: 'none' })
+                uni.showToast({ title: e.msg || (isCopy ? '复制失败' : '新增失败'), icon: 'none' })
             }
             }
         },
         },
         validateRequired() {
         validateRequired() {

@@ -271,6 +271,12 @@ export default {
                 visible: true,
                 visible: true,
                 event: 'auditDetail3'
                 event: 'auditDetail3'
             },
             },
+            {
+                text: '复制',
+                visible: true,
+                variant: 'outline',
+                event: 'copy'
+            },
             ],
             ],
         }
         }
     },
     },
@@ -296,6 +302,7 @@ export default {
                 { ...this.buttons[7], visible: (s === 'FORMAL' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-unlocked-contract:approve')) },
                 { ...this.buttons[7], visible: (s === 'FORMAL' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-unlocked-contract:approve')) },
                 { ...this.buttons[8], visible: (s === 'STANDARD' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-unlocked-contract:approve')) },
                 { ...this.buttons[8], visible: (s === 'STANDARD' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-unlocked-contract:approve')) },
                 { ...this.buttons[9], visible: (s === 'STANDARD' && f && a === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-unlocked-contract:standard-approve')) },
                 { ...this.buttons[9], visible: (s === 'STANDARD' && f && a === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-unlocked-contract:standard-approve')) },
+                { ...this.buttons[13], visible: (s !== 'DELETED' && this.$auth.hasPermi('contract-manage:distribution-unlocked-contract:copy')) },
             ]
             ]
         }
         }
     },
     },
@@ -445,6 +452,20 @@ export default {
             if (e === 'auditDetail1') return this.onAuditDetail(this.detail.id || '', 'FORMAL_CONTRACT')
             if (e === 'auditDetail1') return this.onAuditDetail(this.detail.id || '', 'FORMAL_CONTRACT')
             if (e === 'auditDetail2') return this.onAuditDetail(this.detail.parentId || '', 'FORMAL_CONTRACT')
             if (e === 'auditDetail2') return this.onAuditDetail(this.detail.parentId || '', 'FORMAL_CONTRACT')
             if (e === 'auditDetail3') return this.onAuditDetail(this.detail.id || '', 'STANDARD_CONTRACT')
             if (e === 'auditDetail3') return this.onAuditDetail(this.detail.id || '', 'STANDARD_CONTRACT')
+            if (e === 'copy') return this.onCopy(btn && btn.params)
+        },
+        getBusinessId() {
+            return (this.detail && (this.detail.id || this.detail.code)) || ''
+        },
+        onCopy() {
+            const id = this.getBusinessId()
+            if (!id) {
+                uni.showToast({ title: '未获取到合同ID，无法复制', icon: 'none' })
+                return
+            }
+            uni.navigateTo({
+                url: '/pages/contract_unplan/add?copyId=' + encodeURIComponent(id)
+            })
         },
         },
         onAudit(id, type) {
         onAudit(id, type) {
             const CACHE_KEY = 'sourceBusinessId'
             const CACHE_KEY = 'sourceBusinessId'

@@ -2,7 +2,7 @@
     <view class="page">
     <view class="page">
         <scroll-view class="scroll" scroll-y>
         <scroll-view class="scroll" scroll-y>
             <view class="lock-page">
             <view class="lock-page">
-                <view class="block" v-for="(item, idx) in items" :key="idx">
+                <view class="block" v-for="(item, idx) in items" :key="item.raw && (item.raw.id || item.raw.lineId || item.raw.productId) || ('row-' + idx)">
                     <view class="block-header">
                     <view class="block-header">
                         <uni-data-checkbox
                         <uni-data-checkbox
                             multiple
                             multiple
@@ -19,63 +19,79 @@
                     </view>
                     </view>
 
 
                     <uni-list v-show="item.collapsed">
                     <uni-list v-show="item.collapsed">
-                        <uni-list-item title="产品名称">
-                            <template v-slot:footer>
-                                <uni-easyinput v-model="item.productName" placeholder="请输入产品名称" :clearable="false" disabled />
+                        <uni-list-item class="select-item" :class="item.productName ? 'is-filled' : 'is-empty'" clickable @click="openProductSheet(idx, 'product')" :rightText="item.productName || '请选择产品名称'" showArrow>
+                            <template v-slot:body>
+                                <view class="item-title"><text>产品名称</text></view>
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="行业">
                         <uni-list-item title="行业">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput v-model="item.industry" placeholder="请输入行业" :clearable="false" disabled />
+                                <uni-easyinput v-model="item.industry" placeholder="请输入行业" />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="牌号">
                         <uni-list-item title="牌号">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput v-model="item.brand" placeholder="请输入牌号" :clearable="false" disabled />
+                                <uni-easyinput v-model="item.brand" placeholder="请输入牌号" />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="品质">
                         <uni-list-item title="品质">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput v-model="item.quality" placeholder="请输入品质" :clearable="false" disabled />
+                                <uni-easyinput v-model="item.quality" placeholder="请输入品质" />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
-                        <uni-list-item title="规格(mm)">
+                        <uni-list-item title="厚度(mm)">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                    <view class="value value-spec">
-                        <view v-if="item.thickness" class="value-spec_val">{{ item.thickness }}</view>
-                        <view v-if="item.thickness" class="value-spec_box">
-                            <view v-if="item.thicknessTolPos" class="value-spec_box_1">{{ item.thicknessTolPos > 0 ? '+' + item.thicknessTolPos : item.thicknessTolPos }}
-                            </view>
-                            <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg > 0 ? '+' + item.thicknessTolNeg : item.thicknessTolNeg }}
-                            </view>
-                        </view>
-                        <view v-if="item.width" class="value-spec_val p12">*</view>
-                        <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
-                        <view v-if="item.width" class="value-spec_box">
-                            <view v-if="item.widthTolPos" class="value-spec_box_1">{{ item.widthTolPos > 0 ? '+' + item.widthTolPos : item.widthTolPos }}
-                            </view>
-                            <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg > 0 ? '+' + item.widthTolNeg : item.widthTolNeg }}
-                            </view>
-                        </view>
-                        <view v-if="item.length" class="value-spec_val p12">*</view>
-                        <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
-                        <view v-if="item.length" class="value-spec_box">
-                            <view v-if="item.lengthTolPos" class="value-spec_box_1">{{ item.lengthTolPos > 0 ? '+' + item.lengthTolPos : item.lengthTolPos }}
-                            </view>
-                            <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg > 0 ? '+' + item.lengthTolNeg : item.lengthTolNeg }}
-                            </view>
-                        </view>
-                    </view>
+                                <uni-easyinput type="digit" v-model="item.thickness" :inputBorder="false" placeholder="请输入厚度" @input="onNonNegativeInput(idx, 'thickness')" @blur="onNonNegativeBlur(idx, 'thickness', 9)" />
+                            </template>
+                        </uni-list-item>
+                        <uni-list-item title="厚度公差上限(mm)">
+                            <template v-slot:footer>
+                                <uni-easyinput type="digit" v-model="item.thicknessTolPos" :inputBorder="false" placeholder="请输入厚度公差上限" @input="onNumberInput(idx, 'thicknessTolPos')" @blur="onNumberBlur(idx, 'thicknessTolPos', 9)" />
+                            </template>
+                        </uni-list-item>
+                        <uni-list-item title="厚度公差下限(mm)">
+                            <template v-slot:footer>
+                                <uni-easyinput type="digit" v-model="item.thicknessTolNeg" :inputBorder="false" placeholder="请输入厚度公差下限" @input="onNumberInput(idx, 'thicknessTolNeg')" @blur="onNumberBlur(idx, 'thicknessTolNeg', 9)" />
+                            </template>
+                        </uni-list-item>
+                        <uni-list-item title="宽度(mm)">
+                            <template v-slot:footer>
+                                <uni-easyinput type="digit" v-model="item.width" :inputBorder="false" placeholder="请输入宽度" @input="onNonNegativeInput(idx, 'width')" @blur="onNonNegativeBlur(idx, 'width', 9)" />
+                            </template>
+                        </uni-list-item>
+                        <uni-list-item title="宽度公差上限(mm)">
+                            <template v-slot:footer>
+                                <uni-easyinput type="digit" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差上限" @input="onNumberInput(idx, 'widthTolPos')" @blur="onNumberBlur(idx, 'widthTolPos', 9)" />
+                            </template>
+                        </uni-list-item>
+                        <uni-list-item title="宽度公差下限(mm)">
+                            <template v-slot:footer>
+                                <uni-easyinput type="digit" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差下限" @input="onNumberInput(idx, 'widthTolNeg')" @blur="onNumberBlur(idx, 'widthTolNeg', 9)" />
+                            </template>
+                        </uni-list-item>
+                        <uni-list-item title="长度(mm)">
+                            <template v-slot:footer>
+                                <uni-easyinput type="digit" v-model="item.length" :inputBorder="false" placeholder="请输入长度" @input="onNonNegativeInput(idx, 'length')" @blur="onNonNegativeBlur(idx, 'length', 9)" />
+                            </template>
+                        </uni-list-item>
+                        <uni-list-item title="长度公差上限(mm)">
+                            <template v-slot:footer>
+                                <uni-easyinput type="digit" v-model="item.lengthTolPos" :inputBorder="false" placeholder="请输入长度公差上限" @input="onNumberInput(idx, 'lengthTolPos')" @blur="onNumberBlur(idx, 'lengthTolPos', 9)" />
+                            </template>
+                        </uni-list-item>
+                        <uni-list-item title="长度公差下限(mm)">
+                            <template v-slot:footer>
+                                <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false" placeholder="请输入长度公差下限" @input="onNumberInput(idx, 'lengthTolNeg')" @blur="onNumberBlur(idx, 'lengthTolNeg', 9)" />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="物料编码">
                         <uni-list-item title="物料编码">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput v-model="item.materialCode" placeholder="请输入物料编码" :clearable="false" disabled />
+                                <uni-easyinput v-model="item.materialCode" placeholder="请输入物料编码" />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="状态">
                         <uni-list-item title="状态">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput v-model="item.status" placeholder="请输入状态" :clearable="false" disabled />
+                                <uni-easyinput v-model="item.status" placeholder="请输入状态" />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="数量">
                         <uni-list-item title="数量">
@@ -100,25 +116,25 @@
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="发货日期">
                         <uni-list-item title="发货日期">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput v-model="item.deliveryDate"  :inputBorder="false" disabled  />
+                                <uni-easyinput v-model="item.deliveryDate"  :inputBorder="false"  />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                     </uni-list>
                     </uni-list>
 
 
                     <uni-list v-show="!item.collapsed">
                     <uni-list v-show="!item.collapsed">
-                        <uni-list-item title="产品名称">
-                            <template v-slot:footer>
-                                <uni-easyinput v-model="item.productName" placeholder="请输入产品名称" :clearable="false" disabled />
+                        <uni-list-item class="select-item" :class="item.productName ? 'is-filled' : 'is-empty'" clickable @click="openProductSheet(idx, 'product')" :rightText="item.productName || '请选择产品名称'" showArrow>
+                            <template v-slot:body>
+                                <view class="item-title"><text>产品名称</text></view>
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="行业">
                         <uni-list-item title="行业">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput v-model="item.industry" placeholder="请输入行业" :clearable="false" disabled />
+                                <uni-easyinput v-model="item.industry" placeholder="请输入行业" />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="牌号">
                         <uni-list-item title="牌号">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput v-model="item.brand" placeholder="请输入牌号" :clearable="false" disabled />
+                                <uni-easyinput v-model="item.brand" placeholder="请输入牌号" />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                     </uni-list>
                     </uni-list>
@@ -157,24 +173,52 @@
                 </view>
                 </view>
             </view>
             </view>
         </scroll-view>
         </scroll-view>
-
+        <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value" @confirm="onProductConfirm" />
     </view>
     </view>
 </template>
 </template>
 
 
 <script>
 <script>
 import { getContractApi, specificationLock } from '@/api/contract'
 import { getContractApi, specificationLock } from '@/api/contract'
+import SingleSelectSheet from '@/components/single-select/index.vue'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { formatCurrencyToChinese } from '@/utils/common'
+import { getDicByCodes } from '@/utils/dic'
 
 
 export default {
 export default {
     name: 'ContractUnplanLock',
     name: 'ContractUnplanLock',
+    components: { SingleSelectSheet },
     data() {
     data() {
         return {
         return {
             id: '',
             id: '',
             items: [],
             items: [],
             planQty: 30,
             planQty: 30,
+            sheet: { visible: false, title: '请选择', options: [], idx: -1, value: '', mode: '' },
+            options: [],
         }
         }
     },
     },
   computed: {
   computed: {
+        selectOptions() {
+            const list = Array.isArray(this.options) ? this.options : []
+            if (list.length > 0) {
+                return list.map(o => ({
+                    label: o.label != null ? o.label : (o.text != null ? o.text : (o.name != null ? o.name : '')),
+                    value: o.value != null ? o.value : (o.id != null ? o.id : o.productId)
+                }))
+            }
+            const uniq = {}
+            const opts = []
+            for (let i = 0; i < this.items.length; i++) {
+                const it = this.items[i]
+                const id = it.productId || (it.raw && it.raw.productId)
+                const name = it.productName || (it.raw && (it.raw.productName || it.raw.rawProductName))
+                if (!name) continue
+                const key = String(id || name)
+                if (uniq[key]) continue
+                uniq[key] = true
+                opts.push({ label: name, value: id || name })
+            }
+            return opts
+        },
+        
         totalQuantity() {
         totalQuantity() {
             const qty = this.items.filter(it => it.locked).reduce((p, c) => p + this.toNumber(c.quantity), 0)
             const qty = this.items.filter(it => it.locked).reduce((p, c) => p + this.toNumber(c.quantity), 0)
             return this.round(qty, 2)
             return this.round(qty, 2)
@@ -206,8 +250,40 @@ export default {
         const id = options && options.id ? options.id : ''
         const id = options && options.id ? options.id : ''
         this.id = id
         this.id = id
         this.loadDetail()
         this.loadDetail()
+        this.loadProductOptions()
     },
     },
     methods: {
     methods: {
+        async loadProductOptions() {
+            try {
+                const results = await getDicByCodes(['CONTRACT_PRODUCT'])
+                const c3 = results && results.CONTRACT_PRODUCT && results.CONTRACT_PRODUCT.data ? results.CONTRACT_PRODUCT.data : []
+                this.options = c3.map(it => ({ label: it.name, value: it.code }))
+            } catch (e) {
+                this.options = []
+            }
+        },
+        onNonNegativeInput(idx, field) {
+            const it = this.items[idx]
+            if (!it) return
+            const raw = it[field]
+            it[field] = String(raw || '').replace(/[^0-9.]/g, '')
+            this.$set(this.items, idx, it)
+        },
+        onNumberInput(idx, field) {
+            const it = this.items[idx]
+            if (!it) return
+            const raw = it[field]
+            it[field] = String(raw || '').replace(/[^0-9.\-]/g, '')
+            this.$set(this.items, idx, it)
+        },
+        onNonNegativeBlur(idx, field, digits) {
+            const it = this.items[idx]
+            if (!it) return
+            const num = Math.max(0, this.toNumber(it[field]))
+            const rounded = this.round(num, digits)
+            it[field] = rounded
+            this.$set(this.items, idx, it)
+        },
         onLockChange(idx, e) {
         onLockChange(idx, e) {
             const it = this.items[idx]
             const it = this.items[idx]
             if (!it) return
             if (!it) return
@@ -225,6 +301,7 @@ export default {
                     locked: false,
                     locked: false,
                     collapsed: true,
                     collapsed: true,
                     raw: v,
                     raw: v,
+                    productId: v.productId || v.rawProductId || '',
                     productName: v.rawProductName || v.productName || '',
                     productName: v.rawProductName || v.productName || '',
                     industry: v.industry || '',
                     industry: v.industry || '',
                     brand: v.rawProductGrade || v.brand || '',
                     brand: v.rawProductGrade || v.brand || '',
@@ -262,6 +339,31 @@ export default {
         onImmediateChange(idx) {
         onImmediateChange(idx) {
             this.$nextTick(() => this.recalculate(idx))
             this.$nextTick(() => this.recalculate(idx))
         },
         },
+        openProductSheet(idx, mode = 'product') {
+            let opts = []
+            let title = ''
+            let value = ''
+            const item = this.items[idx]
+            if (mode === 'product') {
+                opts = this.selectOptions
+                const current = item && item.productId
+                const match = opts.find(o => o.value === current)
+                value = match ? match.value : ''
+                title = '请选择产品'
+            }
+            this.sheet = { ...this.sheet, visible: true, title, options: opts, idx, value, mode }
+        },
+        onProductConfirm({ value, label }) {
+            const { idx, mode } = this.sheet
+            const it = this.items[idx]
+            if (!it) { this.sheet.visible = false; return }
+            if (mode === 'product') {
+                it.productId = value
+                it.productName = label || ''
+            }
+            this.$set(this.items, idx, it)
+            this.sheet.visible = false
+        },
         onNumberBlur(idx, field, digits) {
         onNumberBlur(idx, field, digits) {
             const it = this.items[idx]
             const it = this.items[idx]
             if (!it) return
             if (!it) return
@@ -336,6 +438,26 @@ export default {
                 raw.unitPrice = price
                 raw.unitPrice = price
                 raw.totalAmount = total
                 raw.totalAmount = total
                 raw.amountExcludingTax = excl
                 raw.amountExcludingTax = excl
+                raw.productId = it.productId || raw.productId
+                raw.productName = it.productName
+                if (Object.prototype.hasOwnProperty.call(raw, 'rawProductId')) raw.rawProductId = it.productId || raw.rawProductId
+                if (Object.prototype.hasOwnProperty.call(raw, 'rawProductName')) raw.rawProductName = it.productName
+                raw.industry = it.industry
+                raw.quality = it.quality
+                raw.brand = it.brand
+                if (Object.prototype.hasOwnProperty.call(raw, 'rawProductGrade')) raw.rawProductGrade = it.brand
+                raw.thickness = it.thickness
+                raw.thicknessTolPos = it.thicknessTolPos
+                raw.thicknessTolNeg = it.thicknessTolNeg
+                raw.width = it.width
+                raw.widthTolPos = it.widthTolPos
+                raw.widthTolNeg = it.widthTolNeg
+                raw.length = it.length
+                raw.lengthTolPos = it.lengthTolPos
+                raw.lengthTolNeg = it.lengthTolNeg
+                raw.materialCode = it.materialCode
+                raw.status = it.status
+                raw.deliveryDate = it.deliveryDate
                 return raw
                 return raw
             })
             })
             if (!selected.length) {
             if (!selected.length) {
@@ -767,4 +889,4 @@ export default {
             height: 60rpx;
             height: 60rpx;
             align-items: center;
             align-items: center;
         }
         }
-</style>
+</style>

@@ -159,6 +159,7 @@ export default {
 			businessFileList: [],
 			businessFileList: [],
 			shareholderFileList: [],
 			shareholderFileList: [],
 			customerInfo: { businessFileList: [], shareholderFileList: [], annualTotalSales: '', mainIndustry: '', annualMaterialOverview: '' },
 			customerInfo: { businessFileList: [], shareholderFileList: [], annualTotalSales: '', mainIndustry: '', annualMaterialOverview: '' },
+			customerInfoOpened: false,
 			companyReview: { companySettlementPeriod: '', companyMaterialSupplyPlan: '', companySuggestedCategory: '', companySuggestedCategoryName: '', companyCreditLimit: '' },
 			companyReview: { companySettlementPeriod: '', companyMaterialSupplyPlan: '', companySuggestedCategory: '', companySuggestedCategoryName: '', companyCreditLimit: '' },
 			categoryOptions: [],
 			categoryOptions: [],
 			sheet: { visible: false, title: '请选择', options: [], value: '', field: '' },
 			sheet: { visible: false, title: '请选择', options: [], value: '', field: '' },
@@ -298,6 +299,14 @@ export default {
 		getPayload() {
 		getPayload() {
 			const ref = this.$refs.basicRef
 			const ref = this.$refs.basicRef
 			const vals = ref && typeof ref.getFormValues === 'function' ? ref.getFormValues() : {}
 			const vals = ref && typeof ref.getFormValues === 'function' ? ref.getFormValues() : {}
+			if (this.auditCtx && this.auditCtx.bizFlag === 'CUSTOMER_CREDIT_EDIT') {
+				if (Array.isArray(vals && vals.businessFileInfoList)) {
+					vals.businessFileList = vals.businessFileInfoList || []
+				}
+				if (Array.isArray(vals && vals.shareholderFileInfoList)) {
+					vals.shareholderFileList = vals.shareholderFileInfoList || []
+				}
+			}
 			return {
 			return {
 				...vals,
 				...vals,
 			}
 			}
@@ -374,7 +383,6 @@ export default {
 					})).filter(it => it.id)
 					})).filter(it => it.id)
 				}
 				}
 				const vals = this.getPayload() || {}
 				const vals = this.getPayload() || {}
-				console.log(vals,'12312321')
 				if (this.customerInfo.annualTotalSales === '' && vals.annualTotalSales !== undefined && vals.annualTotalSales !== null) {
 				if (this.customerInfo.annualTotalSales === '' && vals.annualTotalSales !== undefined && vals.annualTotalSales !== null) {
 					this.customerInfo.annualTotalSales = vals.annualTotalSales
 					this.customerInfo.annualTotalSales = vals.annualTotalSales
 				}
 				}
@@ -384,14 +392,15 @@ export default {
 				if (this.customerInfo.annualMaterialOverview === '' && vals.annualMaterialOverview !== undefined && vals.annualMaterialOverview !== null) {
 				if (this.customerInfo.annualMaterialOverview === '' && vals.annualMaterialOverview !== undefined && vals.annualMaterialOverview !== null) {
 					this.customerInfo.annualMaterialOverview = vals.annualMaterialOverview
 					this.customerInfo.annualMaterialOverview = vals.annualMaterialOverview
 				}
 				}
-				const b = (this.customerInfo && this.customerInfo.businessFileList && this.customerInfo.businessFileList.length > 0)
-					? this.customerInfo.businessFileList
-					: (vals.businessFileList || [])
-				const s = (this.customerInfo && this.customerInfo.shareholderFileList && this.customerInfo.shareholderFileList.length > 0)
-					? this.customerInfo.shareholderFileList
-					: (vals.shareholderFileList || [])
+				const b = this.customerInfoOpened
+					? (this.customerInfo.businessFileList || [])
+					: ((vals.businessFileList || vals.businessFileInfoList || []))
+				const s = this.customerInfoOpened
+					? (this.customerInfo.shareholderFileList || [])
+					: ((vals.shareholderFileList || vals.shareholderFileInfoList || []))
 				this.businessFileList = toListModel(b)
 				this.businessFileList = toListModel(b)
 				this.shareholderFileList = toListModel(s)
 				this.shareholderFileList = toListModel(s)
+				this.customerInfoOpened = true
 				this.$refs.customerInfoPopup && this.$refs.customerInfoPopup.open()
 				this.$refs.customerInfoPopup && this.$refs.customerInfoPopup.open()
 			} else if (this.extraBtnText === '公司评审') {
 			} else if (this.extraBtnText === '公司评审') {
 				this.$refs.companyReviewPopup && this.$refs.companyReviewPopup.open()
 				this.$refs.companyReviewPopup && this.$refs.companyReviewPopup.open()
@@ -456,10 +465,19 @@ export default {
 			if (this.auditCtx.bizFlag === 'CUSTOMER_CREDIT_EDIT') {
 			if (this.auditCtx.bizFlag === 'CUSTOMER_CREDIT_EDIT') {
 				//  运作科档案员审核（yzkday） --客户信息数据
 				//  运作科档案员审核（yzkday） --客户信息数据
 				if (this.roleCodes.includes('yzkday')) {
 				if (this.roleCodes.includes('yzkday')) {
-					_data = {
-						..._data,
-						...this.customerInfo
+					const savedBusiness = Array.isArray(this.customerInfo && this.customerInfo.businessFileList) ? this.customerInfo.businessFileList : []
+					const savedShareholder = Array.isArray(this.customerInfo && this.customerInfo.shareholderFileList) ? this.customerInfo.shareholderFileList : []
+					const currentBusiness = Array.isArray(_data.businessFileList) ? _data.businessFileList : (Array.isArray(_data.businessFileInfoList) ? _data.businessFileInfoList : [])
+					const currentShareholder = Array.isArray(_data.shareholderFileList) ? _data.shareholderFileList : (Array.isArray(_data.shareholderFileInfoList) ? _data.shareholderFileInfoList : [])
+					const merged = { ..._data }
+					if (this.customerInfoOpened) {
+						if (this.customerInfo.annualTotalSales != null) merged.annualTotalSales = this.customerInfo.annualTotalSales
+						if (this.customerInfo.mainIndustry != null) merged.mainIndustry = this.customerInfo.mainIndustry
+						if (this.customerInfo.annualMaterialOverview != null) merged.annualMaterialOverview = this.customerInfo.annualMaterialOverview
 					}
 					}
+					merged.businessFileList = this.customerInfoOpened ? savedBusiness : (savedBusiness.length > 0 ? savedBusiness : currentBusiness)
+					merged.shareholderFileList = this.customerInfoOpened ? savedShareholder : (savedShareholder.length > 0 ? savedShareholder : currentShareholder)
+					_data = merged
 				}
 				}
 				//  运作科主管审核（yzkzg） --公司评审数据
 				//  运作科主管审核（yzkzg） --公司评审数据
 				if (this.roleCodes.includes('yzkzg')) {
 				if (this.roleCodes.includes('yzkzg')) {
@@ -474,7 +492,10 @@ export default {
 				message: this.message,
 				message: this.message,
 				taskId: this.auditCtx.taskId
 				taskId: this.auditCtx.taskId
 			}
 			}
-			console.log('审核__confirmApprove', payload)
+			if (this.auditCtx && this.auditCtx.bizFlag === 'CUSTOMER_CREDIT_EDIT') {
+				delete payload.variables.businessFileInfoList
+				delete payload.variables.shareholderFileInfoList
+			}
 			if (this.approveType === 'PASS') {
 			if (this.approveType === 'PASS') {
 				approvePassApi(payload).then(res => {
 				approvePassApi(payload).then(res => {
 					console.log('审核__approvePass', res)
 					console.log('审核__approvePass', res)

@@ -237,7 +237,7 @@
 </template>
 </template>
 
 
 <script>
 <script>
-import { getDetailApi, updateApi } from '@/api/order_list.js'
+import { getDetailApi, updateApi, getHistoryProductionProcessApi } from '@/api/order_list.js'
 import Product from './product.vue'
 import Product from './product.vue'
 import SingleSelectSheet from '@/components/single-select/index.vue'
 import SingleSelectSheet from '@/components/single-select/index.vue'
 import { getDicName } from '@/utils/dic.js'
 import { getDicName } from '@/utils/dic.js'
@@ -284,6 +284,8 @@ export default {
       dicOptions: { SUPPLIER: [], APPLICABLE_STANDARD: [] },
       dicOptions: { SUPPLIER: [], APPLICABLE_STANDARD: [] },
       sheet: { visible: false, title: '请选择', options: [], value: '', field: '' },
       sheet: { visible: false, title: '请选择', options: [], value: '', field: '' },
       isReadonly: false,
       isReadonly: false,
+      historyProductionProcessLoaded: false,
+      historyProductionProcessLoading: false,
     }
     }
   },
   },
   computed: {
   computed: {
@@ -338,10 +340,33 @@ export default {
         this.form = next;
         this.form = next;
         this.initPurchaseOrderLineList = next.purchaseOrderLineList || [];
         this.initPurchaseOrderLineList = next.purchaseOrderLineList || [];
         this.refreshStandardName()
         this.refreshStandardName()
+        this.fillHistoryProductionProcessIfNeeded()
       } catch (e) {
       } catch (e) {
         uni.showToast({ title: '加载失败', icon: 'none' })
         uni.showToast({ title: '加载失败', icon: 'none' })
       }
       }
     },
     },
+    async fillHistoryProductionProcessIfNeeded() {
+      const m = this.form || {}
+      const id = m.id || m.code || ''
+      if (!id) return
+      if (!m.showProductionProcess) return
+      if (String(m.productionProcess || '').trim()) return
+      if (this.historyProductionProcessLoaded || this.historyProductionProcessLoading) return
+      this.historyProductionProcessLoading = true
+      try {
+        const res = await getHistoryProductionProcessApi(id)
+        const data = res && res.data ? res.data : {}
+        const text = (data && (data.productionProcess || data.historyProductionProcess || data.value)) ? String(data.productionProcess || data.historyProductionProcess || data.value) : ''
+        if (!String(this.form.productionProcess || '').trim() && text.trim()) {
+          this.form.productionProcess = text
+        }
+        this.historyProductionProcessLoaded = true
+      } catch (e) {
+        this.historyProductionProcessLoaded = true
+      } finally {
+        this.historyProductionProcessLoading = false
+      }
+    },
     refreshStandardName() {
     refreshStandardName() {
       const est = (this.dicOptions.APPLICABLE_STANDARD || []).find(o => String(o.code) === String(this.form.executionStandard))
       const est = (this.dicOptions.APPLICABLE_STANDARD || []).find(o => String(o.code) === String(this.form.executionStandard))
       this.form.executionStandardName = est ? (est.name || '') : (this.form.executionStandardName || '')
       this.form.executionStandardName = est ? (est.name || '') : (this.form.executionStandardName || '')