Merge branch 'cjerp-contract-1.0' into test_cjerp

gesilong
2 parents f84c5b27 9748025d
Showing 16 changed files with 231 additions and 51 deletions
pages/contract_foreign_std/add.vue
pages/contract_foreign_std/productRel.vue
pages/contract_foreign_stock/add.vue
pages/contract_foreign_stock/productRel.vue
pages/contract_foreign_unplan/add.vue
pages/contract_foreign_unplan/lock.vue
pages/contract_foreign_unplan/productRel.vue
pages/contract_process/add.vue
pages/contract_process/productRel.vue
pages/contract_retail/add.vue
pages/contract_retail/productRel.vue
pages/contract_stock/add.vue
pages/contract_unplan/add.vue
pages/contract_unplan/lock.vue
pages/contract_unplan/productRel.vue
pages/order_list/detail.vue
--- a/pages/contract_foreign_std/add.vue
View file @15832c3
+++ b/pages/contract_foreign_std/add.vue
View file @15832c3
@@ -296,6 +296,7 @@ export default {
             customerRemarks: [],
             defaultRemark: '',
             regionOptions: [],
+            qualityReqSeq: 0,
         }
     },
     onLoad(query) {
@@ -468,13 +469,17 @@ export default {
         if (!this.form.buyer || !id) {
           return;
         }
+        this.qualityReqSeq = (Number(this.qualityReqSeq) || 0) + 1
+        const seq = this.qualityReqSeq
         try {
           const result = await getCustomerSpecificQualityRequirements({
             customerId: this.form.buyer,
             productIdList:id,
           });
+          if (seq !== this.qualityReqSeq) return
           this.updateFormData(result.data || {});
         } catch (error) {
+          if (seq !== this.qualityReqSeq) return
           console.error('获取客户质量要求失败:', error);
           // 可以根据需要添加错误提示逻辑
           this.$message.error('获取历史数据失败，请稍后重试');
@@ -491,7 +496,7 @@ export default {
           'tolerance',
         ];
         fields.forEach((field) => {
-          this.form[field] = (this.form[field] || '') + (result[field] || '');
+          this.form[field] = result[field] != null ? String(result[field]) : ''
         });
       },
         onProductsChange(products) {
--- a/pages/contract_foreign_std/productRel.vue
View file @15832c3
+++ b/pages/contract_foreign_std/productRel.vue
View file @15832c3
@@ -14,7 +14,7 @@
         </view>
         <view v-if="mode === 'add'" class="add-list">
-            <view v-for="(item, idx) in items" :key="idx" class="block">
+            <view v-for="(item, idx) in items" :key="item._key || idx" class="block">
                 <uni-list v-show="item.collapsed">
                     <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>
@@ -162,7 +162,7 @@
         </view>
         <view v-else class="view-list" v-show="!collapsedView">
-            <view v-for="(item, idx) in items" :key="'v-' + idx" class="card">
+            <view v-for="(item, idx) in items" :key="'v-' + (item._key || idx)" class="card">
                 <view class="row"><text class="label">产品名称</text><text class="value">{{ item.productName }}</text></view>
                 <view class="row"><text class="label">行业</text><text class="value">{{ item.industry }}</text></view>
                 <view class="row"><text class="label">牌号</text><text class="value">{{ item.brand }}</text></view>
@@ -262,20 +262,22 @@ export default {
     },
     list: {
       handler(v) {
-        // const arr = Array.isArray(v) ? v : []
-        // this.items = arr.map(x => ({ ...this.defaultItem(), ...x, collapsed: true }))
-        this.items = v.map(x => ({ ...this.defaultItem(), ...x, sampleOrder: !!x.sampleOrder, collapsed: true }))
+        const arr = Array.isArray(v) ? v : []
+        this.items = arr.map(x => ({ ...this.defaultItem(), ...x, _key: x && x._key ? x._key : this.newKey(), sampleOrder: !!x.sampleOrder, collapsed: true }))
         console.log('v', v)
       },
       deep: true
     }
   },
   created() {
-    const init = Array.isArray(this.list) && this.list.length > 0 ? this.list.map(v => ({ ...this.defaultItem(), ...v, sampleOrder: !!v.sampleOrder, collapsed: true })) : [{ ...this.defaultItem(), collapsed: false }]
+    const init = Array.isArray(this.list) && this.list.length > 0 ? this.list.map(v => ({ ...this.defaultItem(), ...v, _key: v && v._key ? v._key : this.newKey(), sampleOrder: !!v.sampleOrder, collapsed: true })) : [{ ...this.defaultItem(), _key: this.newKey(), collapsed: false }]
     this.items = init
     this.recalculateAll()
   },
   methods: {
+        newKey() {
+            return `${Date.now()}-${Math.random().toString(16).slice(2)}`
+        },
         defaultItem() {
             return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', materialCode: '', status: '', quantity: '', unitPrice: '', processingFee: undefined, totalAmount: 0, deliveryDate: '', sampleOrder: false }
         },
@@ -439,8 +441,9 @@ export default {
         onAdd() {
             if (this.items.length >= this.max) return uni.showToast({ title: `最多添加${this.max}个`, icon: 'none' })
             const obj = this.defaultItem()
+            obj._key = this.newKey()
             obj.collapsed = true
-            this.items.push(obj)
+            this.items.unshift(obj)
             this.emitChange()
         },
         onRemove(idx) {
--- a/pages/contract_foreign_stock/add.vue
View file @15832c3
+++ b/pages/contract_foreign_stock/add.vue
View file @15832c3
@@ -298,6 +298,7 @@ export default {
             customerRemarks: [],
             defaultRemark: '',
             regionOptions: [],
+            qualityReqSeq: 0,
         }
     },
     onLoad(query) {
@@ -470,13 +471,17 @@ export default {
         if (!this.form.buyer || !id) {
           return;
         }
+        this.qualityReqSeq = (Number(this.qualityReqSeq) || 0) + 1
+        const seq = this.qualityReqSeq
         try {
           const result = await getCustomerSpecificQualityRequirements({
             customerId: this.form.buyer,
             productIdList:id,
           });
+          if (seq !== this.qualityReqSeq) return
           this.updateFormData(result.data || {});
         } catch (error) {
+          if (seq !== this.qualityReqSeq) return
           console.error('获取客户质量要求失败:', error);
           // 可以根据需要添加错误提示逻辑
           this.$message.error('获取历史数据失败，请稍后重试');
@@ -494,7 +499,7 @@ export default {
           'tolerance',
         ];
         fields.forEach((field) => {
-          this.form[field] = (this.form[field] || '') + (result[field] || '');
+          this.form[field] = result[field] != null ? String(result[field]) : ''
         });
       },
         onProductsChange(products) {
--- a/pages/contract_foreign_stock/productRel.vue
View file @15832c3
+++ b/pages/contract_foreign_stock/productRel.vue
View file @15832c3
@@ -14,7 +14,7 @@
         </view>
         <view v-if="mode === 'add'" class="add-list">
-            <view v-for="(item, idx) in items" :key="idx" class="block">
+            <view v-for="(item, idx) in items" :key="item._key || idx" class="block">
                 <uni-list v-show="item.collapsed">
                     <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>
@@ -164,7 +164,7 @@
         </view>
         <view v-else class="view-list" v-show="!collapsedView">
-            <view v-for="(item, idx) in items" :key="'v-' + idx" class="card">
+            <view v-for="(item, idx) in items" :key="'v-' + (item._key || idx)" class="card">
                 <view class="row"><text class="label">产品名称</text><text class="value">{{ item.productName }}</text></view>
                 <view class="row"><text class="label">行业</text><text class="value">{{ item.industry }}</text></view>
                 <view class="row"><text class="label">牌号</text><text class="value">{{ item.brand }}</text></view>
@@ -242,16 +242,14 @@ export default {
     },
     list: {
       handler(v) {
-        // const arr = Array.isArray(v) ? v : []
-        // this.items = arr.map(x => ({ ...this.defaultItem(), ...x, collapsed: true }))
-        this.items = v.map(x => ({ ...this.defaultItem(), ...x, sampleOrder: !!x.sampleOrder, collapsed: true }))
-        console.log('v', v)
+        const arr = Array.isArray(v) ? v : []
+        this.items = arr.map(x => ({ ...this.defaultItem(), ...x, _key: x && x._key ? x._key : this.newKey(), sampleOrder: !!x.sampleOrder, collapsed: true }))
       },
       deep: true
     }
   },
   created() {
-    const init = Array.isArray(this.list) && this.list.length > 0 ? this.list.map(v => ({ ...this.defaultItem(), ...v, sampleOrder: !!v.sampleOrder, collapsed: true })) : [{ ...this.defaultItem(), collapsed: false }]
+    const init = Array.isArray(this.list) && this.list.length > 0 ? this.list.map(v => ({ ...this.defaultItem(), ...v, _key: v && v._key ? v._key : this.newKey(), sampleOrder: !!v.sampleOrder, collapsed: true })) : [{ ...this.defaultItem(), _key: this.newKey(), collapsed: false }]
     this.items = init
     this.recalculateAll()
   },
@@ -278,6 +276,9 @@ export default {
     }
   },
   methods: {
+        newKey() {
+            return `${Date.now()}-${Math.random().toString(16).slice(2)}`
+        },
         defaultItem() {
             return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', materialCode: '', status: '', quantity: '', unitPrice: '', processingFee: undefined, totalAmount: 0, deliveryDate: '', sampleOrder: false }
         },
@@ -409,8 +410,9 @@ export default {
         onAdd() {
             if (this.items.length >= this.max) return uni.showToast({ title: `最多添加${this.max}个`, icon: 'none' })
             const obj = this.defaultItem()
+            obj._key = this.newKey()
             obj.collapsed = true
-            this.items.push(obj)
+            this.items.unshift(obj)
             this.emitChange()
         },
         onRemove(idx) {
--- a/pages/contract_foreign_unplan/add.vue
View file @15832c3
+++ b/pages/contract_foreign_unplan/add.vue
View file @15832c3
@@ -296,6 +296,7 @@ export default {
             customerRemarks: [],
             defaultRemark: '',
             regionOptions: [],
+            qualityReqSeq: 0,
         }
     },
     onLoad(query) {
@@ -468,13 +469,17 @@ export default {
         if (!this.form.buyer || !id) {
           return;
         }
+        this.qualityReqSeq = (Number(this.qualityReqSeq) || 0) + 1
+        const seq = this.qualityReqSeq
         try {
           const result = await getCustomerSpecificQualityRequirements({
             customerId: this.form.buyer,
             productIdList:id,
           });
+          if (seq !== this.qualityReqSeq) return
           this.updateFormData(result.data || {});
         } catch (error) {
+          if (seq !== this.qualityReqSeq) return
           console.error('获取客户质量要求失败:', error);
           // 可以根据需要添加错误提示逻辑
           this.$message.error('获取历史数据失败，请稍后重试');
@@ -492,7 +497,7 @@ export default {
           'tolerance',
         ];
         fields.forEach((field) => {
-          this.form[field] = (this.form[field] || '') + (result[field] || '');
+          this.form[field] = result[field] != null ? String(result[field]) : ''
         });
       },
         onProductsChange(products) {
--- a/pages/contract_foreign_unplan/lock.vue
View file @15832c3
+++ b/pages/contract_foreign_unplan/lock.vue
View file @15832c3
@@ -2,6 +2,43 @@
     <view class="page">
         <scroll-view class="scroll" scroll-y>
             <view class="lock-page">
+                <view class="block">
+                    <view class="block-header">
+                        <text class="block-title">具体质量要求</text>
+                    </view>
+                    <uni-list>
+                        <uni-list-item title="件重条头">
+                            <template v-slot:footer>
+                                <uni-easyinput v-model="qualityForm.pieceWeightHead" placeholder="请输入" />
+                            </template>
+                        </uni-list-item>
+                        <uni-list-item title="表面">
+                            <template v-slot:footer>
+                                <uni-easyinput v-model="qualityForm.surface" placeholder="请输入" />
+                            </template>
+                        </uni-list-item>
+                        <uni-list-item title="公差">
+                            <template v-slot:footer>
+                                <uni-easyinput v-model="qualityForm.tolerance" placeholder="请输入" />
+                            </template>
+                        </uni-list-item>
+                        <uni-list-item title="性能">
+                            <template v-slot:footer>
+                                <uni-easyinput v-model="qualityForm.performance" placeholder="请输入" />
+                            </template>
+                        </uni-list-item>
+                        <uni-list-item title="成分">
+                            <template v-slot:footer>
+                                <uni-easyinput v-model="qualityForm.component" placeholder="请输入" />
+                            </template>
+                        </uni-list-item>
+                        <uni-list-item title="包装">
+                            <template v-slot:footer>
+                                <uni-easyinput v-model="qualityForm.packaging" placeholder="请输入" />
+                            </template>
+                        </uni-list-item>
+                    </uni-list>
+                </view>
                 <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">
                         <uni-data-checkbox multiple mode="default" :localdata="[{ text: '锁规', value: 'LOCKED' }]"
@@ -193,6 +230,14 @@ export default {
             planQty: 30,
             sheet: { visible: false, title: '请选择', options: [], idx: -1, value: '', mode: '' },
             options: [],
+            qualityForm: {
+                pieceWeightHead: '',
+                surface: '',
+                tolerance: '',
+                performance: '',
+                component: '',
+                packaging: ''
+            }
         }
     },
     computed: {
@@ -280,6 +325,14 @@ export default {
             try {
                 const res = await getContractApi(this.id)
                 const data = res && res.data ? res.data : {}
+                this.qualityForm = {
+                    pieceWeightHead: data.pieceWeightHead || '',
+                    surface: data.surface || '',
+                    tolerance: data.tolerance || '',
+                    performance: data.performance || '',
+                    component: data.component || '',
+                    packaging: data.packaging || ''
+                }
                 const lines = Array.isArray(data.contractDistributorLineList) ? data.contractDistributorLineList : []
                 const init = lines.map(v => ({
                     locked: false,
@@ -465,6 +518,12 @@ export default {
                 totalAmountIncludingTax: this.totalAmountIncludingTax,
                 totalQuantity: this.totalQuantity,
                 type: 'INTL_OPEN_SPEC_AGMT',
+                pieceWeightHead: this.qualityForm.pieceWeightHead,
+                surface: this.qualityForm.surface,
+                tolerance: this.qualityForm.tolerance,
+                performance: this.qualityForm.performance,
+                component: this.qualityForm.component,
+                packaging: this.qualityForm.packaging,
                 contractDistributorLineList: selected
             }
@@ -548,6 +607,9 @@ export default {
     margin-left: 12rpx;
     font-size: 28rpx;
     color: rgba(0, 0, 0, 0.9);
+    font-weight: 600;
+    font-size: 20px;
+    color: rgba(0, 0, 0, 0.9);
 }
 .ops {
--- a/pages/contract_foreign_unplan/productRel.vue
View file @15832c3
+++ b/pages/contract_foreign_unplan/productRel.vue
View file @15832c3
@@ -14,7 +14,7 @@
         </view>
         <view v-if="mode === 'add'" class="add-list">
-            <view v-for="(item, idx) in items" :key="idx" class="block">
+            <view v-for="(item, idx) in items" :key="item._key || idx" class="block">
                 <uni-list v-show="item.collapsed">
                     <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>
@@ -162,7 +162,7 @@
         </view>
         <view v-else class="view-list" v-show="!collapsedView">
-            <view v-for="(item, idx) in items" :key="'v-' + idx" class="card">
+            <view v-for="(item, idx) in items" :key="'v-' + (item._key || idx)" class="card">
                 <view class="row"><text class="label">产品名称</text><text class="value">{{ item.productName }}</text></view>
                 <view class="row"><text class="label">行业</text><text class="value">{{ item.industry }}</text></view>
                 <view class="row"><text class="label">牌号</text><text class="value">{{ item.brand }}</text></view>
@@ -258,20 +258,21 @@ export default {
     },
     list: {
       handler(v) {
-        // const arr = Array.isArray(v) ? v : []
-        // this.items = arr.map(x => ({ ...this.defaultItem(), ...x, collapsed: true }))
-        this.items = v.map(x => ({ ...this.defaultItem(), ...x, sampleOrder: !!x.sampleOrder, collapsed: true }))
-        console.log('v', v)
+        const arr = Array.isArray(v) ? v : []
+        this.items = arr.map(x => ({ ...this.defaultItem(), ...x, _key: x && x._key ? x._key : this.newKey(), sampleOrder: !!x.sampleOrder, collapsed: true }))
       },
       deep: true
     }
   },
   created() {
-    const init = Array.isArray(this.list) && this.list.length > 0 ? this.list.map(v => ({ ...this.defaultItem(), ...v, sampleOrder: !!v.sampleOrder, collapsed: true })) : [{ ...this.defaultItem(), collapsed: false }]
+    const init = Array.isArray(this.list) && this.list.length > 0 ? this.list.map(v => ({ ...this.defaultItem(), ...v, _key: v && v._key ? v._key : this.newKey(), sampleOrder: !!v.sampleOrder, collapsed: true })) : [{ ...this.defaultItem(), _key: this.newKey(), collapsed: false }]
     this.items = init
     this.recalculateAll()
   },
   methods: {
+        newKey() {
+            return `${Date.now()}-${Math.random().toString(16).slice(2)}`
+        },
         defaultItem() {
             return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', materialCode: '', status: '', quantity: '', unitPrice: '', totalAmount: 0, deliveryDate: '', sampleOrder: false }
         },
@@ -446,8 +447,9 @@ export default {
         onAdd() {
             if (this.items.length >= this.max) return uni.showToast({ title: `最多添加${this.max}个`, icon: 'none' })
             const obj = this.defaultItem()
+            obj._key = this.newKey()
             obj.collapsed = true
-            this.items.push(obj)
+            this.items.unshift(obj)
             this.emitChange()
         },
         onRemove(idx) {
--- a/pages/contract_process/add.vue
View file @15832c3
+++ b/pages/contract_process/add.vue
View file @15832c3
@@ -299,6 +299,7 @@ export default {
             rawToProdRatioList: [],
             rawProductList: [],
             rawProductGradeList: [],
+            qualityReqSeq: 0,
         }
     },
     onLoad(query) {
@@ -471,13 +472,17 @@ export default {
         if (!this.form.buyer || !id) {
           return;
         }
+        this.qualityReqSeq = (Number(this.qualityReqSeq) || 0) + 1
+        const seq = this.qualityReqSeq
         try {
           const result = await getCustomerSpecificQualityRequirements({
             customerId: this.form.buyer,
             productIdList:id,
           });
+          if (seq !== this.qualityReqSeq) return
           this.updateFormData(result.data || {});
         } catch (error) {
+          if (seq !== this.qualityReqSeq) return
           console.error('获取客户质量要求失败:', error);
           // 可以根据需要添加错误提示逻辑
           this.$message.error('获取历史数据失败，请稍后重试');
@@ -495,7 +500,7 @@ export default {
           'tolerance',
         ];
         fields.forEach((field) => {
-          this.form[field] = (this.form[field] || '') + (result[field] || '');
+          this.form[field] = result[field] != null ? String(result[field]) : ''
         });
       },
         onProductsChange(products) {
--- a/pages/contract_process/productRel.vue
View file @15832c3
+++ b/pages/contract_process/productRel.vue
View file @15832c3
@@ -14,7 +14,7 @@
         </view>
         <view v-if="mode === 'add'" class="add-list">
-            <view v-for="(item, idx) in items" :key="idx" class="block">
+            <view v-for="(item, idx) in items" :key="item._key || idx" class="block">
                 <uni-list v-show="item.collapsed">
                     <uni-list-item class="select-item" :class="item.rawProductName ? 'is-filled' : 'is-empty'" clickable @click="openProductSheet(idx, 'product')" :rightText="item.rawProductName || '请选择原材料名称'" showArrow>
                         <template v-slot:body>
@@ -184,7 +184,7 @@
         </view>
         <view v-else class="view-list" v-show="!collapsedView">
-            <view v-for="(item, idx) in items" :key="'v-' + idx" class="card">
+            <view v-for="(item, idx) in items" :key="'v-' + (item._key || idx)" class="card">
                 <view class="row"><text class="label">原材料名称</text><text class="value">{{ item.rawProductName }}</text></view>
                 <view class="row"><text class="label">原材料牌号</text><text class="value">{{ item.rawProductGradeName }}</text></view>
                 <view class="row"><text class="label">原材料提供时间</text><text class="value">{{ item.supplyTime }}</text></view>
@@ -302,19 +302,21 @@ export default {
     },
     list: {
       handler(v) {
-        this.items = v.map(x => ({ ...this.defaultItem(), ...x, sampleOrder: !!x.sampleOrder, collapsed: true }))
-        console.log('v', v)
+        const arr = Array.isArray(v) ? v : []
+        this.items = arr.map(x => ({ ...this.defaultItem(), ...x, _key: x && x._key ? x._key : this.newKey(), sampleOrder: !!x.sampleOrder, collapsed: true }))
       },
       deep: true
     }
   },
   created() {
-    const init = Array.isArray(this.list) && this.list.length > 0 ? this.list.map(v => ({ ...this.defaultItem(), ...v, sampleOrder: !!v.sampleOrder, collapsed: true })) : [{ ...this.defaultItem(), collapsed: false }]
+    const init = Array.isArray(this.list) && this.list.length > 0 ? this.list.map(v => ({ ...this.defaultItem(), ...v, _key: v && v._key ? v._key : this.newKey(), sampleOrder: !!v.sampleOrder, collapsed: true })) : [{ ...this.defaultItem(), _key: this.newKey(), collapsed: false }]
     this.items = init
-    console.log('init', init)
     this.recalculateAll()
   },
   methods: {
+    newKey() {
+      return `${Date.now()}-${Math.random().toString(16).slice(2)}`
+    },
     defaultItem() {
       return { rawProductId: '', rawProductName: '', rawProductGradeId: '', rawProductGradeName: '', industry: '', quality: '', supplyTime: '', materialProductRatio: '', materialProductRatioName: '', materialProductRatioRemarks: '', productName: '', productId: '', productGrade: '', productStatus: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', materialCode:'',  productQuantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '', sampleOrder: false }
     },
@@ -517,8 +519,9 @@ export default {
         onAdd() {
             if (this.items.length >= this.max) return uni.showToast({ title: `最多添加${this.max}个`, icon: 'none' })
             const obj = this.defaultItem()
+            obj._key = this.newKey()
             obj.collapsed = true
-            this.items.push(obj)
+            this.items.unshift(obj)
             this.emitChange()
         },
         onRemove(idx) {
--- a/pages/contract_retail/add.vue
View file @15832c3
+++ b/pages/contract_retail/add.vue
View file @15832c3
@@ -292,6 +292,7 @@ export default {
             customerRemarks: [],
             defaultRemark: '',
             regionOptions: [],
+            qualityReqSeq: 0,
         }
     },
     onLoad(query) {
@@ -465,13 +466,17 @@ export default {
         if (!this.form.buyer || !id) {
           return;
         }
+        this.qualityReqSeq = (Number(this.qualityReqSeq) || 0) + 1
+        const seq = this.qualityReqSeq
         try {
           const result = await getCustomerSpecificQualityRequirements({
             customerId: this.form.buyer,
             productIdList:id,
           });
+          if (seq !== this.qualityReqSeq) return
           this.updateFormData(result.data || {});
         } catch (error) {
+          if (seq !== this.qualityReqSeq) return
           console.error('获取客户质量要求失败:', error);
           // 可以根据需要添加错误提示逻辑
           this.$message.error('获取历史数据失败，请稍后重试');
@@ -489,7 +494,7 @@ export default {
           'tolerance',
         ];
         fields.forEach((field) => {
-          this.form[field] = (this.form[field] || '') + (result[field] || '');
+          this.form[field] = result[field] != null ? String(result[field]) : ''
         });
       },
         onProductsChange(products) {
--- a/pages/contract_retail/productRel.vue
View file @15832c3
+++ b/pages/contract_retail/productRel.vue
View file @15832c3
@@ -14,7 +14,7 @@
         </view>
         <view v-if="mode === 'add'" class="add-list">
-            <view v-for="(item, idx) in items" :key="idx" class="block">
+            <view v-for="(item, idx) in items" :key="item._key || idx" class="block">
                 <uni-list v-show="item.collapsed">
                     <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>
@@ -157,7 +157,7 @@
         </view>
         <view v-else class="view-list" v-show="!collapsedView">
-            <view v-for="(item, idx) in items" :key="'v-' + idx" class="card">
+            <view v-for="(item, idx) in items" :key="'v-' + (item._key || idx)" class="card">
                 <view class="row"><text class="label">产品名称</text><text class="value">{{ item.productName }}</text></view>
                 <view class="row"><text class="label">行业</text><text class="value">{{ item.industry }}</text></view>
                 <view class="row"><text class="label">牌号</text><text class="value">{{ item.brand }}</text></view>
@@ -260,17 +260,20 @@ export default {
         if (!v || !v.length) return
         // Only update if significantly different to avoid loop/reset
         // For now, assuming external update wants to reset
-        this.items = v.map(x => ({ ...this.defaultItem(), ...x, sampleOrder: !!x.sampleOrder, collapsed: true }))
+        this.items = v.map(x => ({ ...this.defaultItem(), ...x, _key: x && x._key ? x._key : this.newKey(), sampleOrder: !!x.sampleOrder, collapsed: true }))
       },
       deep: true
     }
   },
   created() {
-    const init = Array.isArray(this.list) && this.list.length > 0 ? this.list.map(v => ({ ...this.defaultItem(), ...v, sampleOrder: !!v.sampleOrder, collapsed: true })) : [{ ...this.defaultItem(), collapsed: false }]
+    const init = Array.isArray(this.list) && this.list.length > 0 ? this.list.map(v => ({ ...this.defaultItem(), ...v, _key: v && v._key ? v._key : this.newKey(), sampleOrder: !!v.sampleOrder, collapsed: true })) : [{ ...this.defaultItem(), _key: this.newKey(), collapsed: false }]
     this.items = init
     this.recalculateAll()
   },
   methods: {
+        newKey() {
+            return `${Date.now()}-${Math.random().toString(16).slice(2)}`
+        },
         defaultItem() {
             return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', materialCode: '', status: '', quantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '', sampleOrder: false }
         },
@@ -433,8 +436,9 @@ export default {
         onAdd() {
             if (this.items.length >= this.max) return uni.showToast({ title: `最多添加${this.max}个`, icon: 'none' })
             const obj = this.defaultItem()
+            obj._key = this.newKey()
             obj.collapsed = true
-            this.items.push(obj)
+            this.items.unshift(obj)
             this.emitChange()
         },
         onRemove(idx) {
--- a/pages/contract_stock/add.vue
View file @15832c3
+++ b/pages/contract_stock/add.vue
View file @15832c3
@@ -290,6 +290,7 @@ export default {
             customerRemarks: [],
             defaultRemark: '',
             regionOptions: [],
+            qualityReqSeq: 0,
         }
     },
     onLoad(query) {
@@ -462,13 +463,17 @@ export default {
         if (!this.form.buyer || !id) {
           return;
         }
+        this.qualityReqSeq = (Number(this.qualityReqSeq) || 0) + 1
+        const seq = this.qualityReqSeq
         try {
           const result = await getCustomerSpecificQualityRequirements({
             customerId: this.form.buyer,
             productIdList:id,
           });
+          if (seq !== this.qualityReqSeq) return
           this.updateFormData(result.data || {});
         } catch (error) {
+          if (seq !== this.qualityReqSeq) return
           console.error('获取客户质量要求失败:', error);
           // 可以根据需要添加错误提示逻辑
           this.$message.error('获取历史数据失败，请稍后重试');
@@ -486,7 +491,7 @@ export default {
           'tolerance',
         ];
         fields.forEach((field) => {
-          this.form[field] = (this.form[field] || '') + (result[field] || '');
+          this.form[field] = result[field] != null ? String(result[field]) : ''
         });
       },
         onProductsChange(products) {
--- a/pages/contract_unplan/add.vue
View file @15832c3
+++ b/pages/contract_unplan/add.vue
View file @15832c3
@@ -292,6 +292,7 @@ export default {
             customerRemarks: [],
             defaultRemark: '',
             regionOptions: [],
+            qualityReqSeq: 0,
         }
     },
     onLoad(query) {
@@ -466,13 +467,17 @@ export default {
         if (!this.form.buyer || !id) {
           return;
         }
+        this.qualityReqSeq = (Number(this.qualityReqSeq) || 0) + 1
+        const seq = this.qualityReqSeq
         try {
           const result = await getCustomerSpecificQualityRequirements({
             customerId: this.form.buyer,
             productIdList:id,
           });
+          if (seq !== this.qualityReqSeq) return
           this.updateFormData(result.data || {});
         } catch (error) {
+          if (seq !== this.qualityReqSeq) return
           console.error('获取客户质量要求失败:', error);
           // 可以根据需要添加错误提示逻辑
           this.$message.error('获取历史数据失败，请稍后重试');
@@ -490,7 +495,7 @@ export default {
           'tolerance',
         ];
         fields.forEach((field) => {
-          this.form[field] = (this.form[field] || '') + (result[field] || '');
+          this.form[field] = result[field] != null ? String(result[field]) : ''
         });
       },
         onProductsChange(products) {
--- a/pages/contract_unplan/lock.vue
View file @15832c3
+++ b/pages/contract_unplan/lock.vue
View file @15832c3
@@ -2,6 +2,43 @@
     <view class="page">
         <scroll-view class="scroll" scroll-y>
             <view class="lock-page">
+                <view class="block">
+                    <view class="block-header">
+                        <text class="block-title">具体质量要求</text>
+                    </view>
+                    <uni-list>
+                        <uni-list-item title="件重条头">
+                            <template v-slot:footer>
+                                <uni-easyinput v-model="qualityForm.pieceWeightHead" placeholder="请输入" />
+                            </template>
+                        </uni-list-item>
+                        <uni-list-item title="表面">
+                            <template v-slot:footer>
+                                <uni-easyinput v-model="qualityForm.surface" placeholder="请输入" />
+                            </template>
+                        </uni-list-item>
+                        <uni-list-item title="公差">
+                            <template v-slot:footer>
+                                <uni-easyinput v-model="qualityForm.tolerance" placeholder="请输入" />
+                            </template>
+                        </uni-list-item>
+                        <uni-list-item title="性能">
+                            <template v-slot:footer>
+                                <uni-easyinput v-model="qualityForm.performance" placeholder="请输入" />
+                            </template>
+                        </uni-list-item>
+                        <uni-list-item title="成分">
+                            <template v-slot:footer>
+                                <uni-easyinput v-model="qualityForm.component" placeholder="请输入" />
+                            </template>
+                        </uni-list-item>
+                        <uni-list-item title="包装">
+                            <template v-slot:footer>
+                                <uni-easyinput v-model="qualityForm.packaging" placeholder="请输入" />
+                            </template>
+                        </uni-list-item>
+                    </uni-list>
+                </view>
                 <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">
                         <uni-data-checkbox
@@ -193,6 +230,14 @@ export default {
             planQty: 30,
             sheet: { visible: false, title: '请选择', options: [], idx: -1, value: '', mode: '' },
             options: [],
+            qualityForm: {
+                pieceWeightHead: '',
+                surface: '',
+                tolerance: '',
+                performance: '',
+                component: '',
+                packaging: ''
+            }
         }
     },
   computed: {
@@ -296,6 +341,14 @@ export default {
             try {
                 const res = await getContractApi(this.id)
                 const data = res && res.data ? res.data : {}
+                this.qualityForm = {
+                    pieceWeightHead: data.pieceWeightHead || '',
+                    surface: data.surface || '',
+                    tolerance: data.tolerance || '',
+                    performance: data.performance || '',
+                    component: data.component || '',
+                    packaging: data.packaging || ''
+                }
                 const lines = Array.isArray(data.contractDistributorLineList) ? data.contractDistributorLineList : []
                 const init = lines.map(v => ({
                     locked: false,
@@ -481,6 +534,12 @@ export default {
                 totalAmountIncludingTax: this.totalAmountIncludingTax,
                 totalQuantity: this.totalQuantity,
                 type:'DRAFT_DIST_AGMT',
+                pieceWeightHead: this.qualityForm.pieceWeightHead,
+                surface: this.qualityForm.surface,
+                tolerance: this.qualityForm.tolerance,
+                performance: this.qualityForm.performance,
+                component: this.qualityForm.component,
+                packaging: this.qualityForm.packaging,
                 contractDistributorLineList: selected
             }
@@ -563,6 +622,9 @@ export default {
     margin-left: 12rpx;
     font-size: 28rpx;
     color: rgba(0, 0, 0, 0.9);
+    font-weight: 600;
+    font-size: 20px;
+    color: rgba(0, 0, 0, 0.9);
 }
 .ops {
--- a/pages/contract_unplan/productRel.vue
View file @15832c3
+++ b/pages/contract_unplan/productRel.vue
View file @15832c3
@@ -14,7 +14,7 @@
         </view>
         <view v-if="mode === 'add'" class="add-list">
-            <view v-for="(item, idx) in items" :key="idx" class="block">
+            <view v-for="(item, idx) in items" :key="item._key || idx" class="block">
                 <uni-list v-show="item.collapsed">
                     <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>
@@ -157,7 +157,7 @@
         </view>
         <view v-else class="view-list" v-show="!collapsedView">
-            <view v-for="(item, idx) in items" :key="'v-' + idx" class="card">
+            <view v-for="(item, idx) in items" :key="'v-' + (item._key || idx)" class="card">
                 <view class="row"><text class="label">产品名称</text><text class="value">{{ item.productName }}</text></view>
                 <view class="row"><text class="label">行业</text><text class="value">{{ item.industry }}</text></view>
                 <view class="row"><text class="label">牌号</text><text class="value">{{ item.brand }}</text></view>
@@ -257,20 +257,21 @@ export default {
     },
     list: {
       handler(v) {
-        // const arr = Array.isArray(v) ? v : []
-        // this.items = arr.map(x => ({ ...this.defaultItem(), ...x, collapsed: true }))
-        this.items = v.map(x => ({ ...this.defaultItem(), ...x, sampleOrder: !!x.sampleOrder, collapsed: true }))
-        console.log('v', v)
+        const arr = Array.isArray(v) ? v : []
+        this.items = arr.map(x => ({ ...this.defaultItem(), ...x, _key: x && x._key ? x._key : this.newKey(), sampleOrder: !!x.sampleOrder, collapsed: true }))
       },
       deep: true
     }
   },
   created() {
-    const init = Array.isArray(this.list) && this.list.length > 0 ? this.list.map(v => ({ ...this.defaultItem(), ...v, sampleOrder: !!v.sampleOrder, collapsed: true })) : [{ ...this.defaultItem(), collapsed: false }]
+    const init = Array.isArray(this.list) && this.list.length > 0 ? this.list.map(v => ({ ...this.defaultItem(), ...v, _key: v && v._key ? v._key : this.newKey(), sampleOrder: !!v.sampleOrder, collapsed: true })) : [{ ...this.defaultItem(), _key: this.newKey(), collapsed: false }]
     this.items = init
     this.recalculateAll()
   },
   methods: {
+        newKey() {
+            return `${Date.now()}-${Math.random().toString(16).slice(2)}`
+        },
         defaultItem() {
             return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', materialCode: '', status: '', quantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '', sampleOrder: false }
         },
@@ -424,8 +425,9 @@ export default {
         onAdd() {
             if (this.items.length >= this.max) return uni.showToast({ title: `最多添加${this.max}个`, icon: 'none' })
             const obj = this.defaultItem()
+            obj._key = this.newKey()
             obj.collapsed = true
-            this.items.push(obj)
+            this.items.unshift(obj)
             this.emitChange()
         },
         onRemove(idx) {
--- a/pages/order_list/detail.vue
View file @15832c3
+++ b/pages/order_list/detail.vue
View file @15832c3
@@ -5,6 +5,8 @@
         <view class="section">
           <text class="row company">{{ form.orderNo }}</text>
           <view :class="['status', `status_${form.status}`]" />
+          <view class="row"><text class="label">合同类型</text><text class="value">{{ getDicName('CONTRACT_TYPE',form.contractType, dicOptions.CONTRACT_TYPE) }}</text></view>
+
           <view class="row">
             <text class="label">审核状态</text>
             <text class="value" :class="['status2', `status2_${form.examineStatus}`]">
@@ -121,6 +123,7 @@ export default {
         AUDIT_STATUS: [],
         SUPPLIER: [],
         APPLICABLE_STANDARD: [],
+        CONTRACT_TYPE: [],
       },
     }
   },
@@ -267,16 +270,18 @@ export default {
     },
     loadAllDicData() {
-      const dicCodes = ['AUDIT_STATUS', 'SUPPLIER', 'APPLICABLE_STANDARD']
+      const dicCodes = ['AUDIT_STATUS', 'SUPPLIER', 'APPLICABLE_STANDARD', 'CONTRACT_TYPE']
       return getDicByCodes(dicCodes).then(results => {
         this.dicOptions.AUDIT_STATUS = results.AUDIT_STATUS.data || []
         this.dicOptions.SUPPLIER = results.SUPPLIER.data || []
         this.dicOptions.APPLICABLE_STANDARD = results.APPLICABLE_STANDARD.data || []
+        this.dicOptions.CONTRACT_TYPE = results.CONTRACT_TYPE.data || []
       }).catch(() => {
         this.dicOptions = {
           AUDIT_STATUS: [],
           SUPPLIER: [],
           APPLICABLE_STANDARD: [],
+          CONTRACT_TYPE: [],
         }
       })
     },