Merge remote-tracking branch 'origin/cjerp-1.0' into publish_cjerp

@@ -5,13 +5,17 @@ export const statusStyle = [
   { color: '#2BA471', bgColor:'#E3F9E9',text: '审核通过' },
   { color: '#D54941', bgColor:'#FFF0ED',text: '已驳回' },
   { color: '#3D48A3', bgColor:'#F2F3FF',text: '审核中' },
+  { color: '#000', bgColor:'#F2F3FF',text: '已取消' },
 ];
 
 export const statusMap = {
   '生产中': '#2BA471',
+  '审核通过': '#2BA471',
   '审核中': '#3D48A3',
   '已签收': '#E7E7E7',
+  '已取消': '#000',
   '已发货': '#D54941',
+  '已驳回': '#D54941',
 }
 
 const baseUrl = '/contract';
@@ -23,6 +27,15 @@ export function queryApi(params) {
     params
   })
 }
+//取消锁价无规格申请单申请
+export function cancelApi(id) {
+  return request({
+    url: `${baseUrl}/specLockDelayApplication/cancel`,
+    method: 'get',
+    params: { id }
+  })
+}
+
 // 查询锁价无规格申请单列表
 export function querySpecLockApi(params) {
   return request({

@@ -126,4 +126,16 @@ export function getDeptUser() {
     url: '/customerCredit/getDeptUser',
     method: 'get',
   })
+}
+
+// 获取区域
+// type: ALL  代表获取全部区域的值
+export function getArea(type) {
+  return request({
+    url: '/system/dept/queryArea',
+    method: 'get',
+    params: {
+      type,
+    },
+  })
 }
\ No newline at end of file

@@ -47,6 +47,16 @@ export function createApi(params) {
   })
 }
 
+// 新增拜访记录
+export function createVisitRecordApi(params) {
+  return request({
+    url: `/customer/visitRecord`,
+    method: 'post',
+    data: params,
+    contentType: ContentTypeEnum.FORM_URLENCODED
+  })
+}
+
 
 // 修改保存
 export function updateApi(params) {

+import request from '@/utils/request'
+
+const baseUrl = '/system/message/site';
+
+// 查询列表
+export function queryApi(params) {
+  return request({
+    url: `${baseUrl}/query/my`,
+    method: 'get',
+    params
+  })
+}
+
+// 查询内容
+export function getContentApi(id) {
+  return request({
+    url: `${baseUrl}/content`,
+    method: 'get',
+    params: { id }
+  })
+}

@@ -65,3 +65,13 @@ export function listCanRevokeOrChangeOrderInfo(params) {
   })
 }
 
+// 申请发货-检查数据是否规范
+export function checkApi(params) {
+  return request({
+    url: `${baseUrl}/check`,
+    method: 'get',
+    params: { 
+      ...params,
+    },
+  })
+}

@@ -53,50 +53,50 @@
                             <uni-easyinput v-model="item.quality" :inputBorder="false" placeholder="请输入品质" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="厚度">
+                    <uni-list-item title="厚度mm">
                         <template v-slot:footer>
                             <uni-easyinput v-model="item.thickness" :inputBorder="false" placeholder="请输入厚度" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="厚度公差(单项+)">
+                    <uni-list-item title="厚度公差(单项+)mm">
                         <template v-slot:footer>
                             <uni-easyinput v-model="item.thicknessTolPos" :inputBorder="false"
                                 placeholder="请输入厚度公差(单项+)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="厚度公差(单项-)">
+                    <uni-list-item title="厚度公差(单项-)mm">
                         <template v-slot:footer>
                             <uni-easyinput v-model="item.thicknessTolNeg" :inputBorder="false"
                                 placeholder="请输入厚度公差(单项-)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="宽度">
+                    <uni-list-item title="宽度mm">
                         <template v-slot:footer>
                             <uni-easyinput v-model="item.width" :inputBorder="false" placeholder="请输入宽度" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="宽度公差(单项+)">
+                    <uni-list-item title="宽度公差(单项+)mm">
                         <template v-slot:footer>
                             <uni-easyinput v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差(单项+)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="宽度公差(单项-)">
+                    <uni-list-item title="宽度公差(单项-)mm">
                         <template v-slot:footer>
                             <uni-easyinput v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差(单项-)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="长度">
+                    <uni-list-item title="长度mm">
                         <template v-slot:footer>
                             <uni-easyinput v-model="item.length" :inputBorder="false" placeholder="请输入长度" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="长度公差(单项+)">
+                    <uni-list-item title="长度公差(单项+)mm">
                         <template v-slot:footer>
                             <uni-easyinput v-model="item.lengthTolPos" :inputBorder="false"
                                 placeholder="请输入长度公差(单项+)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="长度公差(单项-)">
+                    <uni-list-item title="长度公差(单项-)mm">
                         <template v-slot:footer>
                             <uni-easyinput v-model="item.lengthTolNeg" :inputBorder="false"
                                 placeholder="请输入长度公差(单项-)" />
@@ -129,7 +129,7 @@
                     </uni-list-item>
                     <uni-list-item title="发货日期">
                         <template v-slot:footer>
-                            <uni-datetime-picker type="date" v-model="item.orderDate" @change="onDateChange(idx, $event)" />
+                            <uni-datetime-picker type="date" v-model="item.deliveryDate" @change="onDateChange(idx, $event)" />
                         </template>
                     </uni-list-item>
                 </uni-list>
@@ -151,7 +151,30 @@
                 <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>
                 <view class="row"><text class="label">品质</text><text class="value">{{ item.quality }}</text></view>
-                <view class="row"><text class="label">规格</text><text class="value">{{ item.specDisplay }}</text></view>
+                    <!-- 厚（公差） * 宽（公差） * 长（公差） -->
+                    <view class="row row-spec"><text class="label">规格(mm)</text>
+                        <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 }}
+                                </view>
+                                <view v-if="item.thicknessTolNeg" class="value-spec_box_2">-{{ 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 }}</view>
+                                <view v-if="item.widthTolNeg" class="value-spec_box_2">-{{ 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 }}</view>
+                                <view v-if="item.lengthTolNeg" class="value-spec_box_2">-{{ item.lengthTolNeg }}</view>
+                            </view>
+                        </view>
+                    </view>
                 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view>
                 <view class="row"><text class="label">数量</text><text class="value">{{ item.quantity }}</text></view>
                 <view class="row"><text class="label">单价</text><text class="value">{{ formatCurrency(item.unitPrice)
@@ -162,7 +185,7 @@
                         }}</text></view>
                 <view class="row"><text class="label">总金额</text><text class="value">{{ formatCurrency(item.totalAmount)
                         }}</text></view>
-                <view class="row"><text class="label">发货日期</text><text class="value">{{ item.orderDate }}</text></view>
+                <view class="row"><text class="label">发货日期</text><text class="value">{{ item.deliveryDate }}</text></view>
             </view>
         </view>
             <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value" @confirm="onProductConfirm" />
@@ -176,7 +199,7 @@ export default {
         mode: { type: String, default: 'add' },
         list: { type: Array, default: () => [] },
         max: { type: Number, default: 8 },
-        orderDateBase: { type: String, default: '' },
+        deliveryDateBase: { type: String, default: '' },
         options: { type: Array, default: () => [] }
     },
     components: { SingleSelectSheet },
@@ -218,7 +241,7 @@ export default {
   },
   methods: {
         defaultItem() {
-            return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, orderDate: '' }
+            return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '' }
         },
         onImmediateChange(idx) {
             this.$nextTick(() => this.recalculate(idx))
@@ -319,15 +342,15 @@ export default {
         onDateChange(idx, e) {
             const it = this.items[idx]
             if (!it) return
-            const val = typeof e === 'string' ? e : (e && e.detail && e.detail.value) ? e.detail.value : it.orderDate
+            const val = typeof e === 'string' ? e : (e && e.detail && e.detail.value) ? e.detail.value : it.deliveryDate
             const dateStr = String(val).slice(0, 10)
-            const base = this.orderDateBase ? new Date(this.orderDateBase) : null
+            const base = this.deliveryDateBase ? new Date(this.deliveryDateBase) : null
             const d = new Date(dateStr)
             if (base && !isNaN(d.getTime()) && d.getTime() < base.getTime()) {
                 uni.showToast({ title: '发货日期不得早于订货日期', icon: 'none' })
-                it.orderDate = this.orderDateBase
+                it.deliveryDate = this.deliveryDateBase
             } else {
-                it.orderDate = dateStr
+                it.deliveryDate = dateStr
             }
             this.$set(this.items, idx, it)
         },
@@ -500,8 +523,46 @@ export default {
 
 .value {
     flex: 1;
-    text-align: right;
+    // text-align: right;
     color: rgba(0, 0, 0, 0.9);
     font-size: 28rpx;
 }
+    .value-spec {
+        height: 48rpx;
+        display: flex;
+        align-items: center;
+        color: #000000;
+        // justify-content: end;
+        &_box {
+            position: relative;
+            width: 60rpx;
+            height: 48rpx;
+
+            &_1 {
+                font-size: 16rpx;
+                position: absolute;
+                top: -10rpx;
+                left: 0;
+            }
+
+            &_2 {
+                font-size: 16rpx;
+                position: absolute;
+                bottom: -10rpx;
+                left: 0;
+            }
+        }
+
+        &_val {
+            font-size: 28rpx;
+
+            &.p12 {
+                padding-right: 12rpx;
+            }
+        }
+    }
+        .row-spec {
+            height: 60rpx;
+            align-items: center;
+        }
 </style>

 {
-	"pages": [{
+	"pages": [
+		{
 			"path": "pages/login",
 			"style": {
 				"navigationBarTitleText": "登录",
 				"navigationStyle": "custom"
 			}
-		}, {
+		},
+		{
 			"path": "pages/register",
 			"style": {
 				"navigationBarTitleText": "注册"
 			}
-		}, {
+		},
+		{
 			"path": "pages/index",
 			"style": {
 				"navigationBarTitleText": "首页",
 				"navigationStyle": "custom"
 			}
-		}, {
+		},
+		{
 			"path": "pages/mine/index",
 			"style": {
 				"navigationBarTitleText": "我的",
 				"navigationBarTextStyle": "white"
 			}
-		}, {
+		},
+		{
 			"path": "pages/mine/index2",
 			"style": {
 				"navigationBarTitleText": "我的2"
 			}
-		}, {
+		},
+		{
 			"path": "pages/mine/info/index",
 			"style": {
 				"navigationBarTitleText": "个人信息"
 			}
-		}, {
+		},
+		{
 			"path": "pages/mine/pwd/index",
 			"style": {
 				"navigationBarTitleText": "修改密码"
 			}
-		}, {
+		},
+		{
 			"path": "pages/mine/setting/index",
 			"style": {
 				"navigationBarTitleText": "应用设置"
 			}
-		}, {
+		},
+		{
 			"path": "pages/mine/about/index",
 			"style": {
 				"navigationBarTitleText": "关于我们"
 			}
-		}, {
+		},
+		{
 			"path": "pages/dev_manage/index",
 			"style": {
 				"navigationBarTitleText": "客户开发管理",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
-		}, {
-			"path": "pages/dev_manage/add",
-			"style": {
-				"navigationBarTitleText": "新增客户开发",
-				"navigationBarBackgroundColor": "#ffffff",
-				"navigationBarTextStyle": "black"
-			}
-		}, {
-			"path": "pages/dev_manage/modify",
-			"style": {
-				"navigationBarTitleText": "编辑客户开发",
-				"navigationBarBackgroundColor": "#ffffff",
-				"navigationBarTextStyle": "black"
-			}
-		}, {
+		},
+		{
 			"path": "pages/dev_manage/add",
 			"style": {
 				"navigationBarTitleText": "新增客户开发",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
-        }, {
-            "path": "pages/dev_manage/detail",
-            "style": {
-                "navigationBarTitleText": "查看客户开发",
-                "navigationBarBackgroundColor": "#ffffff",
-                "navigationBarTextStyle": "black"
-            }
-        }, {
-            "path": "pages/credit_manage/index",
-            "style": {
-                "navigationBarTitleText": "客户资信管理",
-                "navigationBarBackgroundColor": "#ffffff",
-                "navigationBarTextStyle": "black"
-            }
-        }, {
-            "path": "pages/credit_manage/add",
-            "style": {
-                "navigationBarTitleText": "新增客户资信",
-                "navigationBarBackgroundColor": "#ffffff",
-                "navigationBarTextStyle": "black"
-            }
-        }, {
-            "path": "pages/credit_manage/detail",
-            "style": {
-                "navigationBarTitleText": "查看客户资信",
-                "navigationBarBackgroundColor": "#ffffff",
-                "navigationBarTextStyle": "black"
-            }
-        }, {
-            "path": "pages/credit_manage/modify",
-            "style": {
-                "navigationBarTitleText": "编辑客户资信",
-                "navigationBarBackgroundColor": "#ffffff",
-                "navigationBarTextStyle": "black"
-            }
-        }, {
-            "path": "pages/credit_manage/change",
+		},
+        {
+            "path": "pages/dev_manage/modify",
             "style": {
-                "navigationBarTitleText": "申请客户资信变更",
+                "navigationBarTitleText": "编辑客户开发",
                 "navigationBarBackgroundColor": "#ffffff",
                 "navigationBarTextStyle": "black"
             }
-        }, {
-            "path": "pages/credit_manage/history_detail",
+        },
+        {
+            "path": "pages/dev_manage/visit_add",
             "style": {
-                "navigationBarTitleText": "变更记录详情",
+                "navigationBarTitleText": "新增拜访记录",
                 "navigationBarBackgroundColor": "#ffffff",
                 "navigationBarTextStyle": "black"
             }
         },
-        {
-            "path": "pages/flow/myflow",
-            "style": {
-                "navigationBarTitleText": "我发起的",
-                "navigationBarBackgroundColor": "#ffffff",
+		{
+			"path": "pages/dev_manage/add",
+			"style": {
+				"navigationBarTitleText": "新增客户开发",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/dev_manage/detail",
+			"style": {
+				"navigationBarTitleText": "查看客户开发",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/credit_manage/index",
+			"style": {
+				"navigationBarTitleText": "客户资信管理",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/credit_manage/add",
+			"style": {
+				"navigationBarTitleText": "新增客户资信",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/credit_manage/detail",
+			"style": {
+				"navigationBarTitleText": "查看客户资信",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/credit_manage/modify",
+			"style": {
+				"navigationBarTitleText": "编辑客户资信",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/credit_manage/change",
+			"style": {
+				"navigationBarTitleText": "申请客户资信变更",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/credit_manage/history_detail",
+			"style": {
+				"navigationBarTitleText": "变更记录详情",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/flow/myflow",
+			"style": {
+				"navigationBarTitleText": "我发起的",
+				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
 		},
@@ -149,395 +177,452 @@
 				"navigationBarTextStyle": "black"
 			}
 		},
-        {
-            "path": "pages/flow/audit",
-            "style": {
-                "navigationBarTitleText": "审核",
-                "navigationBarBackgroundColor": "#ffffff",
-                "navigationBarTextStyle": "black"
-            }
-        },
-        {
-            "path": "pages/order_list/index",
-            "style": {
-                "navigationBarTitleText": "订货单列表",
-                "navigationBarBackgroundColor": "#ffffff",
-                "navigationBarTextStyle": "black"
-            }
-        },{
-            "path": "pages/order_list/detail",
-            "style": {
-                "navigationBarTitleText": "查看订货单",
-                "navigationBarBackgroundColor": "#ffffff",
-                "navigationBarTextStyle": "black"
-            }
-        },
-        {
-            "path": "pages/order_list/modify",
-            "style": {
-                "navigationBarTitleText": "编辑订货单",
-                "navigationBarBackgroundColor": "#ffffff",
-                "navigationBarTextStyle": "black"
-            }
-        },
-        {
-            "path": "pages/order_list/shipment_apply",
-            "style": {
-                "navigationBarTitleText": "申请发货",
-                "navigationBarBackgroundColor": "#ffffff",
-                "navigationBarTextStyle": "black"
-            }
-        },
-        {
-            "path": "pages/revoke_list/index",
-            "style": {
-                "navigationBarTitleText": "撤销单列表",
-                "navigationBarBackgroundColor": "#ffffff",
-                "navigationBarTextStyle": "black"
-            }
-        },{
-            "path": "pages/revoke_list/add",
-            "style": {
-                "navigationBarTitleText": "新增撤销单",
-                "navigationBarBackgroundColor": "#ffffff",
-                "navigationBarTextStyle": "black"
-            }
-        },{
-            "path": "pages/revoke_list/detail",
-            "style": {
-                "navigationBarTitleText": "查看撤销单",
-                "navigationBarBackgroundColor": "#ffffff",
-                "navigationBarTextStyle": "black"
-            }
-        },{
-            "path": "pages/revoke_list/modify",
-            "style": {
-                "navigationBarTitleText": "编辑撤销单",
-                "navigationBarBackgroundColor": "#ffffff",
-                "navigationBarTextStyle": "black"
-            }
-        },
-        {
-            "path": "pages/change_list/index",
-            "style": {
-                "navigationBarTitleText": "规格变更单",
-                "navigationBarBackgroundColor": "#ffffff",
-                "navigationBarTextStyle": "black"
-            }
-        },{
-            "path": "pages/change_list/add",
-            "style": {
-                "navigationBarTitleText": "新增规格变更单",
-                "navigationBarBackgroundColor": "#ffffff",
-                "navigationBarTextStyle": "black"
-            }
-        },{
-            "path": "pages/change_list/detail",
-            "style": {
-                "navigationBarTitleText": "查看规格变更单",
-                "navigationBarBackgroundColor": "#ffffff",
-                "navigationBarTextStyle": "black"
-            }
-        },{
-            "path": "pages/change_list/modify",
-            "style": {
-                "navigationBarTitleText": "编辑规格变更单",
-                "navigationBarBackgroundColor": "#ffffff",
-                "navigationBarTextStyle": "black"
-            }
-        },
-        {
-            "path": "pages/contract_framework/index",
-            "style": {
-                "navigationBarTitleText": "框架合同",
-                "navigationBarBackgroundColor": "#ffffff",
+		{
+			"path": "pages/flow/audit",
+			"style": {
+				"navigationBarTitleText": "审核",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/order_list/index",
+			"style": {
+				"navigationBarTitleText": "订货单列表",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/order_list/detail",
+			"style": {
+				"navigationBarTitleText": "查看订货单",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/order_list/modify",
+			"style": {
+				"navigationBarTitleText": "编辑订货单",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/order_list/shipment_apply",
+			"style": {
+				"navigationBarTitleText": "申请发货",
+				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
-		}, {
+		},
+		{
+			"path": "pages/revoke_list/index",
+			"style": {
+				"navigationBarTitleText": "撤销单列表",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/revoke_list/add",
+			"style": {
+				"navigationBarTitleText": "新增撤销单",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/revoke_list/detail",
+			"style": {
+				"navigationBarTitleText": "查看撤销单",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/revoke_list/modify",
+			"style": {
+				"navigationBarTitleText": "编辑撤销单",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/change_list/index",
+			"style": {
+				"navigationBarTitleText": "规格变更单",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/change_list/add",
+			"style": {
+				"navigationBarTitleText": "新增规格变更单",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/change_list/detail",
+			"style": {
+				"navigationBarTitleText": "查看规格变更单",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/change_list/modify",
+			"style": {
+				"navigationBarTitleText": "编辑规格变更单",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/contract_framework/index",
+			"style": {
+				"navigationBarTitleText": "框架合同",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
 			"path": "pages/contract_framework/add",
 			"style": {
 				"navigationBarTitleText": "新增框架合同",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
-        }, {
-            "path": "pages/contract_framework/detail",
-            "style": {
-                "navigationBarTitleText": "框架合同详情",
-                "navigationBarBackgroundColor": "#ffffff",
-                "navigationBarTextStyle": "black"
-            }
-        }, {
-            "path": "pages/contract_framework/modify",
-            "style": {
-                "navigationBarTitleText": "编辑框架合同",
-                "navigationBarBackgroundColor": "#ffffff",
-                "navigationBarTextStyle": "black"
-            }
-        },{
-            "path": "pages/contract_retail/index",
-            "style": {
-                "navigationBarTitleText": "经销标准合同",
-                "navigationBarBackgroundColor": "#ffffff",
-                "navigationBarTextStyle": "black"
-            }
-		}, {
+		},
+		{
+			"path": "pages/contract_framework/detail",
+			"style": {
+				"navigationBarTitleText": "框架合同详情",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/contract_framework/modify",
+			"style": {
+				"navigationBarTitleText": "编辑框架合同",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/contract_retail/index",
+			"style": {
+				"navigationBarTitleText": "经销标准合同",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
 			"path": "pages/contract_retail/add",
 			"style": {
 				"navigationBarTitleText": "新增经销标准合同",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
-		},{
+		},
+		{
 			"path": "pages/contract_retail/detail",
 			"style": {
 				"navigationBarTitleText": "经销标准合同详情",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
-		},{
+		},
+		{
 			"path": "pages/contract_retail/modify",
 			"style": {
 				"navigationBarTitleText": "编辑经销标准合同",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
-		},{
+		},
+		{
 			"path": "pages/contract_stock/index",
 			"style": {
 				"navigationBarTitleText": "经销库存合同",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
-		}, {
+		},
+		{
 			"path": "pages/contract_stock/add",
 			"style": {
 				"navigationBarTitleText": "新增经销库存合同",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
-		},{
+		},
+		{
 			"path": "pages/contract_stock/detail",
 			"style": {
 				"navigationBarTitleText": "经销库存合同详情",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
-		},{
+		},
+		{
 			"path": "pages/contract_stock/modify",
 			"style": {
 				"navigationBarTitleText": "编辑经销库存合同",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
-		},{
+		},
+		{
 			"path": "pages/contract_stock/lock",
 			"style": {
 				"navigationBarTitleText": "锁价",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
-		},{
+		},
+		{
 			"path": "pages/contract_unplan/index",
 			"style": {
 				"navigationBarTitleText": "经销未锁规合同",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
-		},{
+		},
+		{
 			"path": "pages/contract_unplan/add",
 			"style": {
 				"navigationBarTitleText": "新增经销未锁规合同",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
-		},{
+		},
+		{
 			"path": "pages/contract_unplan/detail",
 			"style": {
 				"navigationBarTitleText": "经销未锁规合同详情",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
-		},{
+		},
+		{
 			"path": "pages/contract_unplan/modify",
 			"style": {
 				"navigationBarTitleText": "编辑经销未锁规合同",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
-		},{
+		},
+		{
 			"path": "pages/contract_unplan/lock",
 			"style": {
 				"navigationBarTitleText": "锁规",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
-		}, {
+		},
+		{
 			"path": "pages/contract_unplan/lock_apply",
 			"style": {
 				"navigationBarTitleText": "锁规延期申请",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
-		},{
+		},
+		{
 			"path": "pages/contract_process/index",
 			"style": {
 				"navigationBarTitleText": "加工标准合同",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
-		},{
+		},
+		{
 			"path": "pages/contract_process/add",
 			"style": {
 				"navigationBarTitleText": "新增加工标准合同",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
-		},{
+		},
+		{
 			"path": "pages/contract_process/detail",
 			"style": {
 				"navigationBarTitleText": "加工标准合同详情",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
-		},{
+		},
+		{
 			"path": "pages/contract_process/modify",
 			"style": {
 				"navigationBarTitleText": "编辑加工标准合同",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
-		}, {
+		},
+		{
 			"path": "pages/contract_foreign_std/index",
 			"style": {
 				"navigationBarTitleText": "外贸标准合同",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
-		},{
+		},
+		{
 			"path": "pages/contract_foreign_std/add",
 			"style": {
 				"navigationBarTitleText": "新增外贸标准合同",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
-		},{
+		},
+		{
 			"path": "pages/contract_foreign_std/detail",
 			"style": {
 				"navigationBarTitleText": "外贸标准合同详情",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
-		},{
+		},
+		{
 			"path": "pages/contract_foreign_std/modify",
 			"style": {
 				"navigationBarTitleText": "编辑外贸标准合同",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
-		}, {
+		},
+		{
 			"path": "pages/contract_foreign_stock/index",
 			"style": {
 				"navigationBarTitleText": "外贸库存合同",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
-		},{
+		},
+		{
 			"path": "pages/contract_foreign_stock/add",
 			"style": {
 				"navigationBarTitleText": "新增外贸库存合同",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
-		},{
+		},
+		{
 			"path": "pages/contract_foreign_stock/detail",
 			"style": {
 				"navigationBarTitleText": "外贸库存合同详情",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
-		},{
+		},
+		{
 			"path": "pages/contract_foreign_stock/modify",
 			"style": {
 				"navigationBarTitleText": "编辑外贸库存合同",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
-		},{
+		},
+		{
 			"path": "pages/contract_foreign_stock/lock",
 			"style": {
 				"navigationBarTitleText": "锁价",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
-		},{
+		},
+		{
 			"path": "pages/contract_foreign_unplan/index",
 			"style": {
 				"navigationBarTitleText": "外贸未锁规合同",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
-		},{
+		},
+		{
 			"path": "pages/contract_foreign_unplan/add",
 			"style": {
 				"navigationBarTitleText": "新增外贸未锁规合同",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
-		},{
+		},
+		{
 			"path": "pages/contract_foreign_unplan/detail",
 			"style": {
 				"navigationBarTitleText": "外贸未锁规合同详情",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
-		},{
+		},
+		{
 			"path": "pages/contract_foreign_unplan/modify",
 			"style": {
 				"navigationBarTitleText": "编辑外贸未锁规合同",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
-		},{
+		},
+		{
 			"path": "pages/contract_foreign_unplan/lock",
 			"style": {
 				"navigationBarTitleText": "锁规",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
-		},{
+		},
+		{
 			"path": "pages/contract_foreign_unplan/lock_apply",
 			"style": {
 				"navigationBarTitleText": "锁规延期申请",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
-		},{
+		},
+		{
 			"path": "pages/contract_unlocked_operation/detail",
 			"style": {
 				"navigationBarTitleText": "锁价无规格操作申请单详情",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
-		},{
+		},
+		{
 			"path": "pages/contract_unlocked_operation/modify",
 			"style": {
 				"navigationBarTitleText": "编辑锁价无规格操作申请单",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
-		},{
+		},
+		{
 			"path": "pages/contract_unlocked_operation/index",
 			"style": {
 				"navigationBarTitleText": "锁价无规格操作申请单",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
+		},
+		{
+			"path": "pages/message/index",
+			"style": {
+				"navigationBarTitleText": "消息列表",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
 		}
 	],
-	"subPackages": [{
+	"subPackages": [
+		{
 			"root": "pages-business",
-			"pages": [{
+			"pages": [
+				{
 					"path": "purchase/config",
 					"style": {
 						"navigationBarTitleText": "采购设置"
@@ -571,7 +656,8 @@
 		},
 		{
 			"root": "pages-data",
-			"pages": [{
+			"pages": [
+				{
 					"path": "address/index",
 					"style": {
 						"navigationBarTitleText": "地址管理"
@@ -656,17 +742,20 @@
 		"color": "rgba(0,0,0,0.9)",
 		"backgroundColor": "#ffffff",
 		"borderStyle": "white",
-		"list": [{
-			"pagePath": "pages/index",
-			"iconPath": "static/images/tabbar/home.png",
-			"selectedIconPath": "static/images/tabbar/home_act.png",
-			"text": "首页"
-		}, {
-			"pagePath": "pages/mine/index",
-			"iconPath": "static/images/tabbar/mine.png",
-			"selectedIconPath": "static/images/tabbar/mine_act.png",
-			"text": "我的"
-		}]
+		"list": [
+			{
+				"pagePath": "pages/index",
+				"iconPath": "static/images/tabbar/home.png",
+				"selectedIconPath": "static/images/tabbar/home_act.png",
+				"text": "首页"
+			},
+			{
+				"pagePath": "pages/mine/index",
+				"iconPath": "static/images/tabbar/mine.png",
+				"selectedIconPath": "static/images/tabbar/mine_act.png",
+				"text": "我的"
+			}
+		]
 	},
 	"globalStyle": {
 		"navigationBarTitleText": "ERP",

@@ -37,14 +37,14 @@
 
           <uni-list-item title="交货方式">
             <template v-slot:footer>
-              <uni-easyinput v-model="form.deliveryMethod" placeholder="请输入交货方式" :inputBorder="false" />
+              <view class="readonly-text">{{ form.deliveryMethod }}</view>
             </template>
           </uni-list-item>
         </view>
 
         <!-- 产品 -->
         <view class="section2">
-          <Product mode="add" :list="initPurchaseOrderLineList" @change="purchaseOrderLineListChange" />
+          <Product mode="add" :list="initPurchaseOrderLineList" @change="purchaseOrderLineListChange" :orderDate="form.orderDate" />
         </view>
 
         <view class="section">
@@ -69,17 +69,6 @@
               </view>
             </template>
           </uni-list-item>
-          <uni-list-item class="amount-item">
-            <template v-slot:body>
-              <view class="item-title"><text>包装费</text></view>
-            </template>
-            <template v-slot:footer>
-              <view class="amount-row">
-                <uni-easyinput type="number" v-model="form.packagingFee" placeholder="0.00" :inputBorder="false" />
-                <text class="unit">元</text>
-              </view>
-            </template>
-          </uni-list-item>
           <uni-list-item class="select-item" :class="form.executionStandardName ? 'is-filled' : 'is-empty'" clickable
             @click="openSheet('executionStandard')" :rightText="form.executionStandardName || '请选择'" showArrow>
             <template v-slot:body>
@@ -91,6 +80,11 @@
               <uni-easyinput v-model="form.executionStandardRemarks" placeholder="请输入标准" :inputBorder="false" />
             </template>
           </uni-list-item>
+          <uni-list-item title="变更说明">
+            <template v-slot:footer>
+              <uni-easyinput v-model="form.changeDescription" placeholder="请输入变更说明" :inputBorder="false" />
+            </template>
+          </uni-list-item>
         </view>
 
 
@@ -185,6 +179,7 @@ export default {
         packagingFee: '',
         executionStandard: '',
         executionStandardRemarks: '',
+        changeDescription: '',
         totalQuantity: '',
         afterTotalQuantity: '',
         pieceWeightHeader: '',
@@ -297,7 +292,7 @@ export default {
             delete next.id
             delete next.status
             this.form = next
-            const lines = Array.isArray(item.purchaseOrderLineList) ? item.purchaseOrderLineList.map(x => ({ ...x, purchaseOrderId: x.id, id: '' })) : []
+            const lines = Array.isArray(item.purchaseOrderLineList) ? item.purchaseOrderLineList.map(x => ({ ...x, purchaseOrderId: x.id, afterId: x.id, id: '' })) : []
             this.initPurchaseOrderLineList = lines
             const sum = lines.reduce((acc, it) => {
               const v = Number(it && it.quantity)

@@ -29,10 +29,10 @@
           <view class="row"><text class="label">价格表编号</text><text class="value">{{ form.priceListNo }}</text></view>
           <view class="row"><text class="label">开票情况</text><text class="value">{{ form.invoicingStatus }}</text></view>
           <view class="row"><text class="label">运费</text><text class="value">{{ form.shippingCost }}</text></view>
-          <view class="row"><text class="label">包装费</text><text class="value">{{ form.packagingFee }}</text></view>
           <view class="row"><text class="label">执行标准</text><text class="value">{{ getDicName('APPLICABLE_STANDARD',
             form.executionStandard, dicOptions.APPLICABLE_STANDARD) }}</text></view>
           <view v-if="form.executionStandard === 'OTHER'" class="row"><text class="label">标准</text><text class="value">{{ form.executionStandardRemarks }}</text></view>
+          <view class="row"><text class="label">变更说明</text><text class="value">{{ form.changeDescription }}</text></view>
         </view>
         
         <view class="title-header">
@@ -102,11 +102,11 @@ export default {
     displayButtons() {
       const f = this.statusFlags
       return [
-        { ...this.buttons[0], visible: f.canEdit },
-        { ...this.buttons[1], visible: true },
-        { ...this.buttons[2], visible: f.canAudit },
-        { ...this.buttons[3], visible: f.canConfirmChange },
-        { ...this.buttons[4], visible: f.canCancel },
+        { ...this.buttons[0], visible: f.canEdit && this.$auth.hasPermi('order-manage:change-list:modify') },
+        { ...this.buttons[1], visible: this.$auth.hasPermi('order-manage:change-list:review') },
+        { ...this.buttons[2], visible: f.canAudit && this.$auth.hasPermi('order-manage:change-list:approve') },
+        { ...this.buttons[3], visible: f.canConfirmChange && this.$auth.hasPermi('order-manage:change-list:confirm') },
+        { ...this.buttons[4], visible: f.canCancel && this.$auth.hasPermi('order-manage:change-list:cancel') },
       ]
     }
   },

@@ -5,7 +5,7 @@
         <uni-search-bar v-model="searchKeyword" radius="6" placeholder="请输入订货单位或订单编号" clearButton="auto"
           cancelButton="none" bgColor="#F3F3F3" textColor="rgba(0,0,0,0.4)" @confirm="onSearchConfirm"
           @input="onSearchInput" />
-        <image class="tool-icon" src="/static/images/dev_manage/add_icon.png" @click="onAdd" />
+        <image v-if="$auth.hasPermi('order-manage:change-list:add')" class="tool-icon" src="/static/images/dev_manage/add_icon.png" @click="onAdd" />
         <image class="tool-icon" src="/static/images/dev_manage/filter_icon.png" @click="openFilter" />
       </view>
     </view>
@@ -17,8 +17,9 @@
           <view class="card" @click.stop="onCardClick(item)">
             <view class="card-header">
               <text class="title omit2">{{ item.orderingUnitName }}</text>
-              <text v-if="item.examineStatus" :class="['status', `status_${item.examineStatus}`]">{{ filterStatus(item.examineStatus)
-              }}</text>
+              <text v-if="item.examineStatus" :class="['status', `status_${item.examineStatus}`]">{{
+                filterStatus(item.examineStatus)
+                }}</text>
             </view>
             <view class="info-row"><text>订单编号</text><text>{{ item.orderNo }}</text></view>
             <view class="info-row"><text>生产厂</text><text>{{ item.workshopName }}</text></view>
@@ -289,12 +290,12 @@ export default {
     }
 
     text {
-      width: 60%;
+      width: 50%;
       line-height: 32rpx;
+      word-wrap: break-word;
 
       &:last-child {
         color: rgba(0, 0, 0, 0.9);
-        width: 40%;
       }
     }
   }

@@ -36,14 +36,14 @@
 
           <uni-list-item title="交货方式">
             <template v-slot:footer>
-              <uni-easyinput v-model="form.deliveryMethod" placeholder="请输入交货方式" :inputBorder="false" />
+              <view class="readonly-text">{{ form.deliveryMethod }}</view>
             </template>
           </uni-list-item>
         </view>
 
         <!-- 产品 -->
         <view class="section2">
-          <Product mode="add" :list="initPurchaseOrderLineList" @change="purchaseOrderLineListChange" />
+          <Product mode="add" :list="initPurchaseOrderLineList" @change="purchaseOrderLineListChange" :orderDate="form.orderDate" />
         </view>
 
         <view class="section">
@@ -68,17 +68,6 @@
               </view>
             </template>
           </uni-list-item>
-          <uni-list-item class="amount-item">
-            <template v-slot:body>
-              <view class="item-title"><text>包装费</text></view>
-            </template>
-            <template v-slot:footer>
-              <view class="amount-row">
-                <uni-easyinput type="number" v-model="form.packagingFee" placeholder="0.00" :inputBorder="false" />
-                <text class="unit">元</text>
-              </view>
-            </template>
-          </uni-list-item>
           <uni-list-item class="select-item" :class="form.executionStandardName ? 'is-filled' : 'is-empty'" clickable
             @click="openSheet('executionStandard')" :rightText="form.executionStandardName || '请选择'" showArrow>
             <template v-slot:body>
@@ -90,6 +79,11 @@
               <uni-easyinput v-model="form.executionStandardRemarks" placeholder="请输入标准" :inputBorder="false" />
             </template>
           </uni-list-item>
+          <uni-list-item title="变更说明">
+            <template v-slot:footer>
+              <uni-easyinput v-model="form.changeDescription" placeholder="请输入变更说明" :inputBorder="false" />  
+            </template>
+          </uni-list-item>
         </view>
 
 
@@ -182,6 +176,7 @@ export default {
         packagingFee: '',
         executionStandard: '',
         executionStandardRemarks: '',
+        changeDescription: '',
         totalQuantity: '',
         afterTotalQuantity: '',
         pieceWeightHeader: '',

@@ -34,58 +34,74 @@
                         </template>
                     </uni-list-item>
                     <view v-show="!item.collapsed">
-                        <uni-list-item title="厚度">
+                        <uni-list-item title="厚度(mm)">
                             <template v-slot:footer>
-                                <uni-easyinput type="digit" v-model="item.thickness" placeholder="请输入厚度" :inputBorder="false"
-                                    @input="onNonNegativeNumberInput($event, item, idx, 'thickness')" @blur="onNonNegativeNumberBlur(item, idx, 'thickness')" />
+                                <uni-easyinput type="digit" v-model="item.thickness" placeholder="请输入厚度"
+                                    :inputBorder="false"
+                                    @input="onNonNegativeNumberInput($event, item, idx, 'thickness')"
+                                    @blur="onNonNegativeNumberBlur(item, idx, 'thickness')" />
                             </template>
                         </uni-list-item>
-                        <uni-list-item title="厚度公差 +">
+                        <uni-list-item title="厚度公差 +(mm)">
                             <template v-slot:footer>
                                 <uni-easyinput type="digit" v-model="item.thicknessTolPos" placeholder="请输入厚度公差 +"
-                                    :inputBorder="false" @input="onNonNegativeNumberInput($event, item, idx, 'thicknessTolPos')" @blur="onNonNegativeNumberBlur(item, idx, 'thicknessTolPos')" />
+                                    :inputBorder="false"
+                                    @input="onNonNegativeNumberInput($event, item, idx, 'thicknessTolPos')"
+                                    @blur="onNonNegativeNumberBlur(item, idx, 'thicknessTolPos')" />
                             </template>
                         </uni-list-item>
-                        <uni-list-item title="厚度公差 -">
+                        <uni-list-item title="厚度公差 -(mm)">
                             <template v-slot:footer>
                                 <uni-easyinput type="digit" v-model="item.thicknessTolNeg" placeholder="请输入厚度公差 -"
-                                    :inputBorder="false" @input="onNonNegativeNumberInput($event, item, idx, 'thicknessTolNeg')" @blur="onNonNegativeNumberBlur(item, idx, 'thicknessTolNeg')" />
+                                    :inputBorder="false"
+                                    @input="onNonNegativeNumberInput($event, item, idx, 'thicknessTolNeg')"
+                                    @blur="onNonNegativeNumberBlur(item, idx, 'thicknessTolNeg')" />
                             </template>
                         </uni-list-item>
-                        <uni-list-item title="宽度">
+                        <uni-list-item title="宽度(mm)">
                             <template v-slot:footer>
-                                <uni-easyinput type="digit" v-model="item.width" placeholder="请输入宽度" :inputBorder="false"
-                                    @input="onNonNegativeNumberInput($event, item, idx, 'width')" @blur="onNonNegativeNumberBlur(item, idx, 'width')" />
+                                <uni-easyinput type="digit" v-model="item.width" placeholder="请输入宽度"
+                                    :inputBorder="false" @input="onNonNegativeNumberInput($event, item, idx, 'width')"
+                                    @blur="onNonNegativeNumberBlur(item, idx, 'width')" />
                             </template>
                         </uni-list-item>
-                        <uni-list-item title="宽度公差 +">
+                        <uni-list-item title="宽度公差 +(mm)">
                             <template v-slot:footer>
                                 <uni-easyinput type="digit" v-model="item.widthTolPos" placeholder="请输入宽度公差 +"
-                                    :inputBorder="false" @input="onNonNegativeNumberInput($event, item, idx, 'widthTolPos')" @blur="onNonNegativeNumberBlur(item, idx, 'widthTolPos')" />
+                                    :inputBorder="false"
+                                    @input="onNonNegativeNumberInput($event, item, idx, 'widthTolPos')"
+                                    @blur="onNonNegativeNumberBlur(item, idx, 'widthTolPos')" />
                             </template>
                         </uni-list-item>
-                        <uni-list-item title="宽度公差 -">
+                        <uni-list-item title="宽度公差 -(mm)">
                             <template v-slot:footer>
                                 <uni-easyinput type="digit" v-model="item.widthTolNeg" placeholder="请输入宽度公差 -"
-                                    :inputBorder="false" @input="onNonNegativeNumberInput($event, item, idx, 'widthTolNeg')" @blur="onNonNegativeNumberBlur(item, idx, 'widthTolNeg')" />
+                                    :inputBorder="false"
+                                    @input="onNonNegativeNumberInput($event, item, idx, 'widthTolNeg')"
+                                    @blur="onNonNegativeNumberBlur(item, idx, 'widthTolNeg')" />
                             </template>
                         </uni-list-item>
-                        <uni-list-item title="长度">
+                        <uni-list-item title="长度(mm)">
                             <template v-slot:footer>
-                                <uni-easyinput type="digit" v-model="item.length" placeholder="请输入长度" :inputBorder="false"
-                                    @input="onNonNegativeNumberInput($event, item, idx, 'length')" @blur="onNonNegativeNumberBlur(item, idx, 'length')" />
+                                <uni-easyinput type="digit" v-model="item.length" placeholder="请输入长度"
+                                    :inputBorder="false" @input="onNonNegativeNumberInput($event, item, idx, 'length')"
+                                    @blur="onNonNegativeNumberBlur(item, idx, 'length')" />
                             </template>
                         </uni-list-item>
-                        <uni-list-item title="长度公差 +">
+                        <uni-list-item title="长度公差 +(mm)">
                             <template v-slot:footer>
                                 <uni-easyinput type="digit" v-model="item.lengthTolPos" placeholder="请输入长度公差 +"
-                                    :inputBorder="false" @input="onNonNegativeNumberInput($event, item, idx, 'lengthTolPos')" @blur="onNonNegativeNumberBlur(item, idx, 'lengthTolPos')" />
+                                    :inputBorder="false"
+                                    @input="onNonNegativeNumberInput($event, item, idx, 'lengthTolPos')"
+                                    @blur="onNonNegativeNumberBlur(item, idx, 'lengthTolPos')" />
                             </template>
                         </uni-list-item>
-                        <uni-list-item title="长度公差 -">
+                        <uni-list-item title="长度公差 -(mm)">
                             <template v-slot:footer>
                                 <uni-easyinput type="digit" v-model="item.lengthTolNeg" placeholder="请输入长度公差 -"
-                                    :inputBorder="false" @input="onNonNegativeNumberInput($event, item, idx, 'lengthTolNeg')" @blur="onNonNegativeNumberBlur(item, idx, 'lengthTolNeg')" />
+                                    :inputBorder="false"
+                                    @input="onNonNegativeNumberInput($event, item, idx, 'lengthTolNeg')"
+                                    @blur="onNonNegativeNumberBlur(item, idx, 'lengthTolNeg')" />
                             </template>
                         </uni-list-item>
                         <uni-list-item title="状态">
@@ -95,19 +111,38 @@
                         </uni-list-item>
                         <uni-list-item title="数量kg">
                             <template v-slot:footer>
-                                <uni-easyinput type="digit" v-model="item.quantity" placeholder="请输入数量kg" :inputBorder="false"
-                                    @input="onNonNegativeNumberInput($event, item, idx, 'quantity')" @blur="onNonNegativeNumberBlur(item, idx, 'quantity')" />
+                                <uni-easyinput type="digit" v-model="item.quantity" placeholder="请输入数量kg"
+                                    :inputBorder="false"
+                                    @input="onNonNegativeNumberInput($event, item, idx, 'quantity')"
+                                    @blur="onNonNegativeNumberBlur(item, idx, 'quantity')" />
                             </template>
                         </uni-list-item>
                         <uni-list-item v-if="item.showSalesPrice" title="销售价格">
                             <template v-slot:footer>
-                                <uni-easyinput type="digit" v-model="item.salesPrice" placeholder="请输入销售价格" :inputBorder="false"
-                                    @input="onNonNegativeNumberInput($event, item, idx, 'salesPrice')" @blur="onNonNegativeNumberBlur(item, idx, 'salesPrice')" />
+                                <uni-easyinput type="digit" v-model="item.salesPrice" placeholder="请输入销售价格"
+                                    :inputBorder="false"
+                                    @input="onNonNegativeNumberInput($event, item, idx, 'salesPrice')"
+                                    @blur="onNonNegativeNumberBlur(item, idx, 'salesPrice')" />
+                            </template>
+                        </uni-list-item>
+                        <uni-list-item class="amount-item">
+                            <template v-slot:body>
+                                <view class="item-title"><text>包装费</text></view>
+                            </template>
+                            <template v-slot:footer>
+                                <view class="amount-row">
+                                    <uni-easyinput type="digit" v-model="item.packagingFee" placeholder="0.00"
+                                        :inputBorder="false"
+                                        @input="onNonNegativeNumberInput($event, item, idx, 'packagingFee')"
+                                        @blur="onNonNegativeNumberBlur(item, idx, 'packagingFee')" />
+                                    <text class="unit">元</text>
+                                </view>
                             </template>
                         </uni-list-item>
                         <uni-list-item title="发货日期">
                             <template v-slot:footer>
-                                <uni-datetime-picker type="date" v-model="item.deliveryDate" />
+                                <uni-datetime-picker type="date" v-model="item.deliveryDate" :start="minDeliveryDate"
+                                    @change="onDeliveryChange($event, item, idx)" />
                             </template>
                         </uni-list-item>
                         <uni-list-item title="考核超协">
@@ -167,10 +202,12 @@
                 <!-- showSalesPrice 判断是否显示 -->
                 <view class="row" v-if="item.showSalesPrice"><text class="label">销售价格</text><text class="value">{{
                     item.salesPrice }}</text></view>
+                <view class="row"><text class="label">包装费</text><text class="value">{{
+                    item.packagingFee }}</text></view>
                 <view class="row"><text class="label">发货日期</text><text class="value">{{ item.deliveryDate }}</text>
                 </view>
                 <view class="row"><text class="label">考核超协</text><text class="value">{{ item.assessmentExceedsAgreement
-                }}</text></view>
+                        }}</text></view>
             </view>
             <view class="view-total">
                 <view class="head">合计</view>
@@ -191,7 +228,8 @@ export default {
         mode: { type: String, default: 'add' },
         list: { type: Array, default: () => [] },
         max: { type: Number, default: 8 },
-        totalQuantity: { type: Number, default: 0 }
+        totalQuantity: { type: Number, default: 0 },
+        orderDate: { type: String, default: '' }
     },
     data() {
         return {
@@ -200,6 +238,21 @@ export default {
         }
     },
     computed: {
+        minDeliveryDate() {
+            const s = this.orderDate
+            if (!s) return ''
+            const parts = String(s).split('-')
+            const y = Number(parts[0])
+            const m = Number(parts[1])
+            const d = Number(parts[2])
+            if (!y || !m || !d) return ''
+            const dt = new Date(y, m - 1, d)
+            dt.setDate(dt.getDate() + 1)
+            const yy = dt.getFullYear()
+            const mm = String(dt.getMonth() + 1).padStart(2, '0')
+            const dd = String(dt.getDate()).padStart(2, '0')
+            return `${yy}/${mm}/${dd}`
+        }
     },
     watch: {
         items: {
@@ -247,7 +300,7 @@ export default {
                 assessmentExceedsAgreement: ''
             }
         },
-       
+
         onAdd() {
             if (this.items.length >= this.max) return uni.showToast({ title: `最多添加${this.max}个`, icon: 'none' })
             const obj = this.defaultItem()
@@ -307,6 +360,29 @@ export default {
         },
         toggleViewCollapse() {
             this.collapsedView = !this.collapsedView
+        },
+        onDeliveryChange(e, item, idx) {
+            const getStr = (x) => {
+                if (x && x.detail && x.detail.value !== undefined) return x.detail.value
+                if (typeof x === 'string') return x
+                return item && item.deliveryDate ? item.deliveryDate : ''
+            }
+            const val = getStr(e)
+            if (!val || !this.orderDate) return
+            const parse = (s) => {
+                const p = String(s).replace(/\//g, '-').split('-')
+                const y = Number(p[0])
+                const m = Number(p[1])
+                const d = Number(p[2])
+                return new Date(y, m - 1, d)
+            }
+            const sel = parse(val)
+            const ord = parse(this.orderDate)
+            if (!(sel > ord)) {
+                item.deliveryDate = ''
+                this.$set(this.items, idx, { ...item })
+                uni.showToast({ title: '发货日期必须大于订货日期', icon: 'none' })
+            }
         }
     }
 }

@@ -29,11 +29,12 @@
       <view class="row"><text class="label">价格表编号</text><text class="value">{{ form.priceListNo }}</text></view>
       <view class="row"><text class="label">开票情况</text><text class="value">{{ form.invoicingStatus }}</text></view>
       <view class="row"><text class="label">运费</text><text class="value">{{ form.shippingCost }}</text></view>
-      <view class="row"><text class="label">包装费</text><text class="value">{{ form.packagingFee }}</text></view>
       <view class="row"><text class="label">执行标准</text><text class="value">{{ getDicName('APPLICABLE_STANDARD',
         form.executionStandard, dicOptions.APPLICABLE_STANDARD) }}</text></view>
       <view v-if="form.executionStandard === 'OTHER'" class="row"><text class="label">标准</text><text class="value">{{
         form.executionStandardRemarks }}</text></view>
+      <view class="row"><text class="label">变更说明</text><text class="value">{{
+        form.changeDescription }}</text></view>
     </view>
 
     <view class="title-header">

@@ -39,7 +39,7 @@
 						<view class="item-title"><text class="required">*</text><text>生产厂</text></view>
 					</template>
 				</uni-list-item>
-                <ProductRel mode="add" :orderDateBase="form.orderDate" @change="onProductsChange" :options="productList" />
+                <ProductRel mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" @change="onProductsChange" :options="productList" />
                 <uni-list-item title="合计人民币金额（大写）">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false" disabled />
@@ -92,33 +92,25 @@
                             :inputBorder="false" />
                     </template>
                 </uni-list-item>
-                <view class="group">
-                    <view class="group-title">特别条款要求</view>
-                    <view class="radio-list">
-                        <view v-for="(opt, i) in specialTermsList" :key="'cr-' + i" class="radio-item"
-                            @click="onRadioSelect('specialTerms', 'specialTermsName', opt)">
-                            <view :class="['radio', { checked: form.specialTerms === opt.value }]" />
-                            <text class="label">{{ opt.label }}</text>
-                        </view>
-                    </view>
-                </view>
-                <view class="group">
-                    <view class="group-title">执行标准</view>
-                    <view class="radio-list">
-                        <view v-for="(opt, i) in executionStandardList" :key="'es-' + i" class="radio-item"
-                            @click="onRadioSelect('executionStandard', 'executionStandardName', opt)">
-                            <view :class="['radio', { checked: form.executionStandard === opt.value }]" />
-                            <text class="label">{{ opt.label }}</text>
-                        </view>
-                    </view>
-                </view>
+                <uni-list-item class="select-item" :class="form.specialTermsName ? 'is-filled' : 'is-empty'" clickable
+                    @click="openSheet('specialTerms')" :rightText="form.specialTermsName || '请选择'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text class="required">*</text><text>特别条款要求</text></view>
+                    </template>
+                </uni-list-item>
+                <uni-list-item class="select-item" :class="form.executionStandardName ? 'is-filled' : 'is-empty'" clickable
+                    @click="openSheet('executionStandard')" :rightText="form.executionStandardName || '请选择'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text>执行标准</text></view>
+                    </template>
+                </uni-list-item>
                 <uni-list-item v-if="form.executionStandard === 'OTHER'" title="其他">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.executionStandardRemarks" placeholder="请输入其他标准备注"
                             :inputBorder="false" />
                     </template>
                 </uni-list-item>
-                <uni-list-item title="特别说明">
+                <uni-list-item title="特别说明" style="margin-top: 20rpx;">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.specialInstructions" placeholder="请输入特别说明" :inputBorder="false" />
                     </template>
@@ -181,23 +173,23 @@
                         数量
                     </div>
                     <div class="total-item-price">
-                        {{ (sumQuantity || 0).toFixed(2) }}t
+                        {{ (totalQuantity || 0).toFixed(2) }}kg
                     </div>
                 </div>
-                <div class="total-item">
+                <!-- <div class="total-item">
                     <div class="total-item-text">
                         不含税金额
                     </div>
                     <div class="total-item-price text-red">
-                        ￥{{ (sumAmountExcl || 0).toFixed(2) }}
+                        ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}
                     </div>
-                </div>
+                </div> -->
                 <div class="total-item">
                     <div class="total-item-text">
                         总金额
                     </div>
                     <div class="total-item-price text-red">
-                        ￥{{ (sumTotal || 0).toFixed(2) }}
+                        ￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}
                     </div>
                 </div>
             </div>
@@ -233,6 +225,7 @@ export default {
                 buyer: '',
                 buyerName: '',
                 orderDate: '',
+                deliveryDate: '',
                 designatedConsignee: '',
                 specialTerms: '',
                 specialTermsName: '',
@@ -243,7 +236,7 @@ export default {
                 includesPackagingFeeName: '',
                 includesTransportFee: false,
                 includesTransportFeeName: '',
-                unit: '元、公斤、元/公斤',
+                unit: '美元、公斤、元美/公斤',
                 totalAmountCapital: '',
                 destinationId: [],
                 destinationLabel: '',
@@ -263,9 +256,9 @@ export default {
             yesNoList: [{ label: '是', value: true }, { label: '否', value: false }],
             sheet: { visible: false, title: '请选择', field: '', options: [], value: '' },
             relate: { visible: false, title: '选择', source: '', display: [], multiple: false, rowKey: 'id', selectedKeys: [], fieldKey: '' },
-            sumQuantity: 0,
-            sumAmountExcl: 0,
-            sumTotal: 0,
+            totalQuantity: 0,
+            // totalAmountExcludingTax: 0,
+            totalAmountIncludingTax: 0,
             productLineList: [],
             productList: [],
             customerRemarks: [],
@@ -365,11 +358,11 @@ export default {
         onProductsChange(products) {
             const list = Array.isArray(products) ? products : []
             const sumQ = list.reduce((acc, it) => acc + (parseFloat(it.quantity) || 0), 0)
-            const sumE = list.reduce((acc, it) => acc + (parseFloat(it.amountExcludingTax) || 0), 0)
+            // const sumE = list.reduce((acc, it) => acc + (parseFloat(it.amountExcludingTax) || 0), 0)
             const sumT = list.reduce((acc, it) => acc + (parseFloat(it.totalAmount) || 0), 0)
-            this.sumQuantity = sumQ
-            this.sumAmountExcl = sumE
-            this.sumTotal = sumT
+            this.totalQuantity = sumQ
+            // this.totalAmountExcludingTax = sumE
+            this.totalAmountIncludingTax = sumT
             this.form.totalAmountCapital = formatCurrencyToChinese(sumT)
             this.productLineList = list
         },
@@ -445,6 +438,10 @@ export default {
                 setSheet('生产厂', opts)
             } else if (field === 'supplier') {
                 setSheet('供方', this.supplierList)
+            } else if (field === 'specialTerms') {
+                setSheet('特别条款要求', this.specialTermsList)
+            } else if (field === 'executionStandard') {
+                setSheet('执行标准', this.executionStandardList)
             } else if (field === 'includesPackagingFee') {
                 setSheet('单价中是否已包含包装费', this.yesNoList)
             } else if (field === 'includesTransportFee') {
@@ -515,9 +512,9 @@ export default {
                 ...formForSubmit,
                 destination,
                 type: 'INTL_STD_CONTRACT',
-                sumQuantity: this.sumQuantity,
-                sumAmountExcl: this.sumAmountExcl,
-                sumTotal: this.sumTotal,
+                totalQuantity: this.totalQuantity,
+                // totalAmountExcludingTax: this.totalAmountExcludingTax,
+                totalAmountIncludingTax: this.totalAmountIncludingTax,
                 contractDistributorLineList: lines
             })
             console.log('onSubmit__payload', payload)
@@ -536,18 +533,31 @@ export default {
                 { key: 'supplier', label: '供方' },
                 { key: 'buyer', label: '需方' },
                 { key: 'orderDate', label: '订货日期' },
+                { key: 'unit', label: '单位' },
                 { key: 'workshopId', label: '生产厂' },
+                { key: 'specialTerms', label: '特别条款要求' },
             ]
             for (const it of checks) {
                 const val = this.form[it.key]
                 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
                 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
             }
-            if (!Array.isArray(this.productLineList) || this.productLineList.length === 0) {
+            const list = Array.isArray(this.productLineList) ? this.productLineList : []
+            if (list.length === 0) {
                 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false
             }
-            for (const [idx, it] of this.productLineList.entries()) {
-                if (!it.productName || !it.quantity || !it.unitPrice) {
+            const strEmpty = (v) => (v === undefined || v === null || (typeof v === 'string' && v.trim() === ''))
+            const numEmpty = (v) => (v === undefined || v === null || v === '' || (typeof v === 'number' && isNaN(v)))
+            for (const [idx, it] of list.entries()) {
+                if (
+                    strEmpty(it.productName) ||
+                    strEmpty(it.industry) ||
+                    strEmpty(it.quality) ||
+                    strEmpty(it.brand) ||
+                    numEmpty(it.quantity) ||
+                    numEmpty(it.unitPrice) ||
+                    strEmpty(it.deliveryDate)
+                ) {
                     uni.showToast({ title: `第${idx + 1}条明细未完整填写`, icon: 'none' }); return false
                 }
             }
@@ -575,7 +585,7 @@ export default {
             color: rgba(0, 0, 0, 0.6);
             line-height: 32rpx;
             width: 240rpx;
-            padding: 24rpx 0;
+            padding: 12rpx 0;
         }
         .total-item-price {
             font-weight: 600;
@@ -597,7 +607,7 @@ export default {
 
 .scroll {
   flex: 1;
-  padding: 12rpx 0 480rpx !important;
+  padding: 12rpx 0 392rpx !important;
 }
 
 .footer {

@@ -211,12 +211,12 @@ export default {
             const t = this.detail.standardApproved || false
             const e = this.detail.standardShowExamine || false
             return [
-                { ...this.buttons[0], visible: (s === 'DRAFT') },
-                { ...this.buttons[1], visible: (s === 'DRAFT') },
-                { ...this.buttons[2], visible: (s !== 'DELETED' && t !== 'AUDIT' && t !== 'PASS') },
-                { ...this.buttons[3], visible: (s === 'STANDARD') },
-                { ...this.buttons[4], visible: (s === 'STANDARD' && e && t === 'AUDIT') },
-                { ...this.buttons[5], visible: (s === 'STANDARD') }
+                { ...this.buttons[0], visible: (s === 'DRAFT' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:modifyx')) },
+                { ...this.buttons[1], visible: (s === 'DRAFT' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:delete')) },
+                { ...this.buttons[2], visible: (s !== 'DELETED' && t !== 'AUDIT' && t !== 'PASS' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:upload')) },
+                { ...this.buttons[3], visible: (s === 'STANDARD' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:upload-seal')) },
+                { ...this.buttons[4], visible: (s === 'STANDARD' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:approve')) },
+                { ...this.buttons[5], visible: (s === 'STANDARD' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:review')) }
             ]
         }
     },

@@ -14,7 +14,7 @@
           @input="onSearchInput"
         />
         <view class="tool-icons">
-          <image class="tool-icon" src="/static/images/dev_manage/add_icon.png" @click="onAdd" />
+          <image v-if="$auth.hasPermi('contract-manage:foreign-trade-standard-contract:add')" class="tool-icon" src="/static/images/dev_manage/add_icon.png" @click="onAdd" />
           <image class="tool-icon" src="/static/images/dev_manage/filter_icon.png" @click="openFilter" />
         </view>
       </view>

@@ -40,9 +40,7 @@
                         <uni-easyinput v-model="form.unit" :inputBorder="false" disabled />
                     </template>
                 </uni-list-item>
-
-                <ProductRel mode="add" :orderDateBase="form.orderDate" :list="productLineList" @change="onProductsChange" :options="productList" />
-
+                <ProductRel mode="add" :deliveryDateBase="form.deliveryDate" :deliveryDate="form.orderDate" :list="productLineList" @change="onProductsChange" :options="productList" />
                 <uni-list-item title="合计人民币金额（大写）">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false"
@@ -98,34 +96,25 @@
                             :inputBorder="false" />
                     </template>
                 </uni-list-item>
-
-                <view class="group">
-                    <view class="group-title">特别条款要求</view>
-                    <view class="radio-list">
-                        <view v-for="(opt, i) in specialTermsList" :key="'cr-' + i" class="radio-item"
-                            @click="onRadioSelect('specialTerms', 'specialTermsName', opt)">
-                            <view :class="['radio', { checked: form.specialTerms === opt.value }]" />
-                            <text class="label">{{ opt.label }}</text>
-                        </view>
-                    </view>
-                </view>
-                <view class="group">
-                    <view class="group-title">执行标准</view>
-                    <view class="radio-list">
-                        <view v-for="(opt, i) in executionStandardList" :key="'es-' + i" class="radio-item"
-                            @click="onRadioSelect('executionStandard', 'executionStandardName', opt)">
-                            <view :class="['radio', { checked: form.executionStandard === opt.value }]" />
-                            <text class="label">{{ opt.label }}</text>
-                        </view>
-                    </view>
-                </view>
+                <uni-list-item class="select-item" :class="form.specialTermsName ? 'is-filled' : 'is-empty'" clickable
+                    @click="openSheet('specialTerms')" :rightText="form.specialTermsName || '请选择'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text class="required">*</text><text>特别条款要求</text></view>
+                    </template>
+                </uni-list-item>
+                <uni-list-item class="select-item" :class="form.executionStandardName ? 'is-filled' : 'is-empty'" clickable
+                    @click="openSheet('executionStandard')" :rightText="form.executionStandardName || '请选择'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text>执行标准</text></view>
+                    </template>
+                </uni-list-item>
                 <uni-list-item v-if="form.executionStandard === 'OTHER'" title="其他">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.executionStandardRemarks" placeholder="请输入其他标准备注"
                             :inputBorder="false" />
                     </template>
                 </uni-list-item>
-                <uni-list-item title="特别说明">
+                <uni-list-item title="特别说明" style="margin-top: 20rpx;">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.specialInstructions" placeholder="请输入特别说明" :inputBorder="false" />
                     </template>
@@ -177,15 +166,15 @@
                 <div class="total-text">合计</div>
                 <div class="total-item">
                     <div class="total-item-text">数量</div>
-                    <div class="total-item-price">{{ (sumQuantity || 0).toFixed(2) }}t</div>
+                    <div class="total-item-price">{{ (totalQuantity || 0).toFixed(2) }}kg</div>
                 </div>
-                <div class="total-item">
+                <!-- <div class="total-item">
                     <div class="total-item-text">不含税金额</div>
-                    <div class="total-item-price text-red">￥{{ (sumAmountExcl || 0).toFixed(2) }}</div>
-                </div>
+                    <div class="total-item-price text-red">￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}</div>
+                </div> -->
                 <div class="total-item">
                     <div class="total-item-text">总金额</div>
-                    <div class="total-item-price text-red">￥{{ (sumTotal || 0).toFixed(2) }}</div>
+                    <div class="total-item-price text-red">￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}</div>
                 </div>
             </div>
             <button class="btn submit" type="primary" @click="onSubmit">保存</button>
@@ -223,6 +212,7 @@ export default {
                 workshopId: '',
                 workshopName: '',
                 orderDate: '',
+                deliveryDate: '',
                 designatedConsignee: '',
                 specialTerms: '',
                 specialTermsName: '',
@@ -233,7 +223,7 @@ export default {
                 includesPackagingFeeName: '',
                 includesTransportFee: false,
                 includesTransportFeeName: '',
-                unit: '元、公斤、元/公斤',
+                unit: '美元、公斤、美元/公斤',
                 totalAmountCapital: '',
                 depositInfo: '',
                 packagingRequirements: '',
@@ -256,9 +246,9 @@ export default {
             yesNoList: [{ label: '是', value: true }, { label: '否', value: false }],
             sheet: { visible: false, title: '请选择', field: '', options: [], value: '' },
             relate: { visible: false, title: '选择', source: '', display: [], multiple: false, rowKey: 'id', selectedKeys: [], fieldKey: '' },
-            sumQuantity: 0,
-            sumAmountExcl: 0,
-            sumTotal: 0,
+            totalQuantity: 0,
+            // totalAmountExcludingTax: 0,
+            totalAmountIncludingTax: 0,
             productLineList: [],
             newProductLineList: [],
             productList: []
@@ -347,11 +337,11 @@ export default {
             const list = Array.isArray(products) ? products : []
             this.newProductLineList = list
             const sumQ = list.reduce((acc, it) => acc + (parseFloat(it.quantity) || 0), 0)
-            const sumE = list.reduce((acc, it) => acc + (parseFloat(it.amountExcludingTax) || 0), 0)
+            // const sumE = list.reduce((acc, it) => acc + (parseFloat(it.amountExcludingTax) || 0), 0)
             const sumT = list.reduce((acc, it) => acc + (parseFloat(it.totalAmount) || 0), 0)
-            this.sumQuantity = sumQ
-            this.sumAmountExcl = sumE
-            this.sumTotal = sumT
+            this.totalQuantity = sumQ
+            // this.totalAmountExcludingTax = sumE
+            this.totalAmountIncludingTax = sumT
             this.form.totalAmountCapital = formatCurrencyToChinese(sumT)
         },
         async loadSuppliers() {
@@ -399,6 +389,10 @@ export default {
                 setSheet('生产厂', opts)
             } else if (field === 'supplier') {
                 setSheet('供方', this.supplierList)
+            } else if (field === 'specialTerms') {
+                setSheet('特别条款要求', this.specialTermsList)
+            } else if (field === 'executionStandard') {
+                setSheet('执行标准', this.executionStandardList)
             } else if (field === 'includesPackagingFee') {
                 setSheet('单价中是否已包含包装费', this.yesNoList)
             } else if (field === 'includesTransportFee') {
@@ -443,18 +437,32 @@ export default {
                 { key: 'supplier', label: '供方' },
                 { key: 'buyer', label: '需方' },
                 { key: 'orderDate', label: '订货日期' },
+                { key: 'unit', label: '单位' },
                 { key: 'workshopId', label: '生产厂' },
+                { key: 'specialTerms', label: '特别条款要求' },
             ]
             for (const it of checks) {
                 const val = this.form[it.key]
                 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
                 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
             }
-            if (!Array.isArray(this.productLineList) || this.productLineList.length === 0) {
+            const list = Array.isArray(this.newProductLineList) ? this.newProductLineList : []
+            if (list.length === 0) {
                 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false
             }
-            for (const [idx, it] of this.productLineList.entries()) {
-                if (!it.productName || !it.quantity || !it.unitPrice) {
+            const strEmpty = (v) => (v === undefined || v === null || (typeof v === 'string' && v.trim() === ''))
+            const numEmpty = (v) => (v === undefined || v === null || v === '' || (typeof v === 'number' && isNaN(v)))
+            for (const [idx, it] of list.entries()) {
+                console.log('it111', it)
+                if (
+                    strEmpty(it.productName) ||
+                    strEmpty(it.industry) ||
+                    strEmpty(it.quality) ||
+                    strEmpty(it.brand) ||
+                    numEmpty(it.quantity) ||
+                    numEmpty(it.unitPrice) ||
+                    strEmpty(it.deliveryDate)
+                ) {
                     uni.showToast({ title: `第${idx + 1}条明细未完整填写`, icon: 'none' }); return false
                 }
             }
@@ -479,25 +487,25 @@ export default {
                 return out
             }
             const lines = (this.newProductLineList || []).map(it => clean(it))
-          const { destinationLabel, destinationId, ...formForSubmit } = this.form;
-          const destination = destinationId && destinationId.length > 0 ? destinationId[destinationId.length - 1] : '';
-            const payload = clean({
-                ...formForSubmit,
-                id: this.form.id,
-                destination,
-                type: 'INTL_STD_CONTRACT',
-                sumQuantity: this.sumQuantity,
-                sumAmountExcl: this.sumAmountExcl,
-                sumTotal: this.sumTotal,
-                contractDistributorLineList: lines
-            })
-            try {
-                await updateContractApi(payload)
-                uni.showToast({ title: '保存成功', icon: 'none' })
-                setTimeout(() => { uni.redirectTo({ url: '/pages/contract_foreign_std/index' }) }, 400)
-            } catch (e) {
-                uni.showToast({ title: '提交失败', icon: 'none' })
-            }
+            const { destinationLabel, destinationId, ...formForSubmit } = this.form;
+            const destination = destinationId && destinationId.length > 0 ? destinationId[destinationId.length - 1] : '';
+                const payload = clean({
+                    ...formForSubmit,
+                    id: this.form.id,
+                    destination,
+                    type: 'INTL_STD_CONTRACT',
+                    totalQuantity: this.totalQuantity,
+                    // totalAmountExcludingTax: this.totalAmountExcludingTax,
+                    totalAmountIncludingTax: this.totalAmountIncludingTax,
+                    contractDistributorLineList: lines
+                })
+                try {
+                    await updateContractApi(payload)
+                    uni.showToast({ title: '保存成功', icon: 'none' })
+                    setTimeout(() => { uni.redirectTo({ url: '/pages/contract_foreign_std/index' }) }, 400)
+                } catch (e) {
+                    uni.showToast({ title: '提交失败', icon: 'none' })
+                }
         }
     }
 }
@@ -524,7 +532,7 @@ export default {
         color: rgba(0, 0, 0, 0.6);
         line-height: 32rpx;
         width: 240rpx;
-        padding: 24rpx 0;
+        padding: 12rpx 0;
     }
 
     .total-item-price {
@@ -547,7 +555,7 @@ export default {
 
 .scroll {
     flex: 1;
-    padding: 12rpx 0 480rpx !important;
+    padding: 12rpx 0 392rpx !important;
 }
 
 .footer {

@@ -53,53 +53,53 @@
                             <uni-easyinput v-model="item.quality" :inputBorder="false" placeholder="请输入品质" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="厚度">
+                    <uni-list-item title="厚度(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.thickness" :inputBorder="false" placeholder="请输入厚度" />
+                            <uni-easyinput type="digit" v-model="item.thickness" :inputBorder="false" placeholder="请输入厚度" @input="onNonNegativeInput(idx, 'thickness')" @blur="onNonNegativeBlur(idx, 'thickness', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="厚度公差(单项+)">
+                    <uni-list-item title="厚度公差上限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.thicknessTolPos" :inputBorder="false"
-                                placeholder="请输入厚度公差(单项+)" />
+                            <uni-easyinput type="digit" v-model="item.thicknessTolPos" :inputBorder="false"
+                                placeholder="请输入厚度公差上限" @input="onNonNegativeInput(idx, 'thicknessTolPos')" @blur="onNonNegativeBlur(idx, 'thicknessTolPos', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="厚度公差(单项-)">
+                    <uni-list-item title="厚度公差下限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.thicknessTolNeg" :inputBorder="false"
-                                placeholder="请输入厚度公差(单项-)" />
+                            <uni-easyinput type="digit" v-model="item.thicknessTolNeg" :inputBorder="false"
+                                placeholder="请输入厚度公差下限" @input="onNonNegativeInput(idx, 'thicknessTolNeg')" @blur="onNonNegativeBlur(idx, 'thicknessTolNeg', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="宽度">
+                    <uni-list-item title="宽度(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.width" :inputBorder="false" placeholder="请输入宽度" />
+                            <uni-easyinput type="digit" v-model="item.width" :inputBorder="false" placeholder="请输入宽度" @input="onNonNegativeInput(idx, 'width')" @blur="onNonNegativeBlur(idx, 'width', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="宽度公差(单项+)">
+                    <uni-list-item title="宽度公差上限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差(单项+)" />
+                            <uni-easyinput type="digit" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差上限" @input="onNonNegativeInput(idx, 'widthTolPos')" @blur="onNonNegativeBlur(idx, 'widthTolPos', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="宽度公差(单项-)">
+                    <uni-list-item title="宽度公差下限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差(单项-)" />
+                            <uni-easyinput type="digit" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差下限" @input="onNonNegativeInput(idx, 'widthTolNeg')" @blur="onNonNegativeBlur(idx, 'widthTolNeg', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="长度">
+                    <uni-list-item title="长度(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.length" :inputBorder="false" placeholder="请输入长度" />
+                            <uni-easyinput type="digit" v-model="item.length" :inputBorder="false" placeholder="请输入长度" @input="onNonNegativeInput(idx, 'length')" @blur="onNonNegativeBlur(idx, 'length', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="长度公差(单项+)">
+                    <uni-list-item title="长度公差上限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.lengthTolPos" :inputBorder="false"
-                                placeholder="请输入长度公差(单项+)" />
+                            <uni-easyinput type="digit" v-model="item.lengthTolPos" :inputBorder="false"
+                                placeholder="请输入长度公差上限" @input="onNonNegativeInput(idx, 'lengthTolPos')" @blur="onNonNegativeBlur(idx, 'lengthTolPos', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="长度公差(单项-)">
+                    <uni-list-item title="长度公差下限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.lengthTolNeg" :inputBorder="false"
-                                placeholder="请输入长度公差(单项-)" />
+                            <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false"
+                                placeholder="请输入长度公差下限" @input="onNonNegativeInput(idx, 'lengthTolNeg')" @blur="onNonNegativeBlur(idx, 'lengthTolNeg', 2)" />
                         </template>
                     </uni-list-item>
                     <uni-list-item title="状态">
@@ -109,12 +109,12 @@
                     </uni-list-item>
                     <uni-list-item title="数量">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.quantity" type="number" :inputBorder="false" placeholder="请输入数量" @input="onImmediateChange(idx)" @blur="onNumberBlur(idx, 'quantity', 0)" />
+                            <uni-easyinput v-model="item.quantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'quantity')" @blur="onNonNegativeBlur(idx, 'quantity', 2)" />
                         </template>
                     </uni-list-item>
                     <uni-list-item title="单价">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.unitPrice" disabled type="number" :inputBorder="false" placeholder="请输入单价" @input="onImmediateChange(idx)" @blur="onNumberBlur(idx, 'unitPrice', 0)" />
+                            <uni-easyinput v-model="item.unitPrice" type="digit" :inputBorder="false" placeholder="请输入销售价格" @input="onNonNegativeInput(idx, 'unitPrice')" @blur="onNonNegativeBlur(idx, 'unitPrice', 2)" />
                         </template>
                     </uni-list-item>
                     <uni-list-item title="外贸加工费">
@@ -122,11 +122,11 @@
                             <uni-easyinput v-model="item.processingFee" type="number" :inputBorder="false" placeholder="请输入外贸加工费" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="不含税金额">
+                    <!-- <uni-list-item title="不含税金额">
                         <template v-slot:footer>
                             <uni-easyinput v-model="item.amountExcludingTax" type="number" :inputBorder="false" disabled placeholder="自动计算" />
                         </template>
-                    </uni-list-item>
+                    </uni-list-item> -->
                     <uni-list-item title="总金额">
                         <template v-slot:footer>
                             <uni-easyinput v-model="item.totalAmount" type="number" :inputBorder="false" disabled placeholder="自动计算" />
@@ -134,7 +134,7 @@
                     </uni-list-item>
                     <uni-list-item title="发货日期">
                         <template v-slot:footer>
-                            <uni-datetime-picker type="date" v-model="item.orderDate" @change="onDateChange(idx, $event)" />
+                            <uni-datetime-picker :start="minDeliveryDate" type="date" v-model="item.deliveryDate" @change="onDateChange(idx, $event)" />
                         </template>
                     </uni-list-item>
                 </uni-list>
@@ -156,18 +156,41 @@
                 <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>
                 <view class="row"><text class="label">品质</text><text class="value">{{ item.quality }}</text></view>
-                <view class="row"><text class="label">规格</text><text class="value">{{ item.specDisplay }}</text></view>
+                    <!-- 厚（公差） * 宽（公差） * 长（公差） -->
+                    <view class="row row-spec"><text class="label">规格(mm)</text>
+                        <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 }}
+                                </view>
+                                <view v-if="item.thicknessTolNeg" class="value-spec_box_2">-{{ 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 }}</view>
+                                <view v-if="item.widthTolNeg" class="value-spec_box_2">-{{ 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 }}</view>
+                                <view v-if="item.lengthTolNeg" class="value-spec_box_2">-{{ item.lengthTolNeg }}</view>
+                            </view>
+                        </view>
+                    </view>
                 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view>
                 <view class="row"><text class="label">数量</text><text class="value">{{ item.quantity }}</text></view>
                 <view class="row"><text class="label">单价</text><text class="value">{{ formatCurrency(item.unitPrice)
                         }}</text>
                 </view>
-                <view class="row"><text class="label">不含税金额</text><text class="value">{{
+                <!-- <view class="row"><text class="label">不含税金额</text><text class="value">{{
                     formatCurrency(item.amountExcludingTax)
-                        }}</text></view>
+                        }}</text></view> -->
                 <view class="row"><text class="label">总金额</text><text class="value">{{ formatCurrency(item.totalAmount)
                         }}</text></view>
-                <view class="row"><text class="label">发货日期</text><text class="value">{{ item.orderDate }}</text></view>
+                <view class="row"><text class="label">发货日期</text><text class="value">{{ item.deliveryDate }}</text></view>
             </view>
         </view>
             <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value" @confirm="onProductConfirm" />
@@ -181,7 +204,8 @@ export default {
         mode: { type: String, default: 'add' },
         list: { type: Array, default: () => [] },
         max: { type: Number, default: 8 },
-        orderDateBase: { type: String, default: '' },
+        deliveryDateBase: { type: String, default: '' },
+        deliveryDate: { type: String, default: '' },
         options: { type: Array, default: () => [] }
     },
     components: { SingleSelectSheet },
@@ -199,6 +223,21 @@ export default {
         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)
       }))
+    },
+    minDeliveryDate() {
+      const s = this.deliveryDate
+      if (!s) return ''
+      const parts = String(s).split('-')
+      const y = Number(parts[0])
+      const m = Number(parts[1])
+      const d = Number(parts[2])
+      if (!y || !m || !d) return ''
+      const dt = new Date(y, m - 1, d)
+      dt.setDate(dt.getDate() + 1)
+      const yy = dt.getFullYear()
+      const mm = String(dt.getMonth() + 1).padStart(2, '0')
+      const dd = String(dt.getDate() - 1).padStart(2, '0')
+      return `${yy}/${mm}/${dd}`
     }
   },
   watch: {
@@ -223,10 +262,18 @@ export default {
   },
   methods: {
         defaultItem() {
-            return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', processingFee: undefined, amountExcludingTax: 0, totalAmount: 0, orderDate: '' }
+            return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '',processingFee: undefined, status: '', quantity: '', unitPrice: '',  totalAmount: 0, deliveryDate: '' }
         },
-        onImmediateChange(idx) {
-            this.$nextTick(() => this.recalculate(idx))
+        onNonNegativeInput(idx, field) {
+            const it = this.items[idx]
+            if (!it) return
+            let v = String(it[field] != null ? it[field] : '')
+            v = v.replace(/[^0-9.]/g, '')
+            v = v.replace(/(\..*)\./g, '$1')
+            if (v.startsWith('.')) v = '0' + v
+            it[field] = v
+            this.$set(this.items, idx, it)
+            if (field === 'quantity' || field === 'unitPrice') this.$nextTick(() => this.recalculate(idx))
         },
         toNumber(val) {
             if (typeof val === 'number') return isNaN(val) ? 0 : val
@@ -239,21 +286,21 @@ export default {
             const m = Math.pow(10, digits)
             return Math.round(n * m) / m
         },
-        onNumberBlur(idx, field, digits) {
+        onNonNegativeBlur(idx, field, digits) {
             const it = this.items[idx]
             if (!it) return
             const raw = it[field]
-            // 如果为空则保持为空，不自动置为0，仅重新计算依赖字段
             if (raw === '' || raw === null || raw === undefined) {
                 this.$set(this.items, idx, it)
-                this.recalculate(idx)
+                if (field === 'quantity' || field === 'unitPrice') this.recalculate(idx)
                 return
             }
-            const num = this.toNumber(raw)
+            let num = this.toNumber(raw)
+            if (isNaN(num) || num < 0) num = 0
             const rounded = this.round(num, digits)
             it[field] = rounded
             this.$set(this.items, idx, it)
-            this.recalculate(idx)
+            if (field === 'quantity' || field === 'unitPrice') this.recalculate(idx)
         },
         formatCurrency(val) {
             if (val == null || val === '') return ''
@@ -291,8 +338,8 @@ export default {
             const qty = this.toNumber(it.quantity)
             const price = this.toNumber(it.unitPrice)
             const total = this.round(qty * price, 2)
-            const excl = this.round(total / (1 + TAX_RATE), 2)
-            const next = { ...it, totalAmount: total, amountExcludingTax: excl }
+            // const excl = this.round(total / (1 + TAX_RATE), 2)
+            const next = { ...it, totalAmount: total }
             this.$set(this.items, idx, next)
         },
         recalculateAll() {
@@ -324,15 +371,15 @@ export default {
         onDateChange(idx, e) {
             const it = this.items[idx]
             if (!it) return
-            const val = typeof e === 'string' ? e : (e && e.detail && e.detail.value) ? e.detail.value : it.orderDate
+            const val = typeof e === 'string' ? e : (e && e.detail && e.detail.value) ? e.detail.value : it.deliveryDate
             const dateStr = String(val).slice(0, 10)
-            const base = this.orderDateBase ? new Date(this.orderDateBase) : null
+            const base = this.deliveryDateBase ? new Date(this.deliveryDateBase) : null
             const d = new Date(dateStr)
             if (base && !isNaN(d.getTime()) && d.getTime() < base.getTime()) {
                 uni.showToast({ title: '发货日期不得早于订货日期', icon: 'none' })
-                it.orderDate = this.orderDateBase
+                it.deliveryDate = this.deliveryDateBase
             } else {
-                it.orderDate = dateStr
+                it.deliveryDate = dateStr
             }
             this.$set(this.items, idx, it)
         },
@@ -388,12 +435,13 @@ export default {
     height: 40rpx;
 }
 
-    .opCollapse {
-        color: rgba(0, 0, 0, 0.6);
-        width: 32rpx;
-        height: 28rpx;
-        margin-right: 16rpx;
-    }
+.opCollapse {
+    color: rgba(0, 0, 0, 0.6);
+    width: 32rpx;
+    height: 28rpx;
+    margin-right: 16rpx;
+    margin-top: 8rpx;
+}
 
 
 .block {
@@ -504,8 +552,46 @@ export default {
 
 .value {
     flex: 1;
-    text-align: right;
+    // text-align: right;
     color: rgba(0, 0, 0, 0.9);
     font-size: 28rpx;
 }
+    .value-spec {
+        height: 48rpx;
+        display: flex;
+        align-items: center;
+        color: #000000;
+        // justify-content: end;
+        &_box {
+            position: relative;
+            width: 60rpx;
+            height: 48rpx;
+
+            &_1 {
+                font-size: 16rpx;
+                position: absolute;
+                top: -10rpx;
+                left: 0;
+            }
+
+            &_2 {
+                font-size: 16rpx;
+                position: absolute;
+                bottom: -10rpx;
+                left: 0;
+            }
+        }
+
+        &_val {
+            font-size: 28rpx;
+
+            &.p12 {
+                padding-right: 12rpx;
+            }
+        }
+    }
+        .row-spec {
+            height: 60rpx;
+            align-items: center;
+        }
 </style>

@@ -39,7 +39,7 @@
 						<view class="item-title"><text class="required">*</text><text>生产厂</text></view>
 					</template>
 				</uni-list-item>
-                <ProductRel mode="add" :orderDateBase="form.orderDate" @change="onProductsChange" :options="productList" />
+                <ProductRel mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" @change="onProductsChange" :options="productList" />
                 <uni-list-item title="合计人民币金额（大写）">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false" disabled />
@@ -92,33 +92,25 @@
                             :inputBorder="false" />
                     </template>
                 </uni-list-item>
-                <view class="group">
-                    <view class="group-title">特别条款要求</view>
-                    <view class="radio-list">
-                        <view v-for="(opt, i) in specialTermsList" :key="'cr-' + i" class="radio-item"
-                            @click="onRadioSelect('specialTerms', 'specialTermsName', opt)">
-                            <view :class="['radio', { checked: form.specialTerms === opt.value }]" />
-                            <text class="label">{{ opt.label }}</text>
-                        </view>
-                    </view>
-                </view>
-                <view class="group">
-                    <view class="group-title">执行标准</view>
-                    <view class="radio-list">
-                        <view v-for="(opt, i) in executionStandardList" :key="'es-' + i" class="radio-item"
-                            @click="onRadioSelect('executionStandard', 'executionStandardName', opt)">
-                            <view :class="['radio', { checked: form.executionStandard === opt.value }]" />
-                            <text class="label">{{ opt.label }}</text>
-                        </view>
-                    </view>
-                </view>
+                <uni-list-item class="select-item" :class="form.specialTermsName ? 'is-filled' : 'is-empty'" clickable
+                    @click="openSheet('specialTerms')" :rightText="form.specialTermsName || '请选择'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text class="required">*</text><text>特别条款要求</text></view>
+                    </template>
+                </uni-list-item>
+                <uni-list-item class="select-item" :class="form.executionStandardName ? 'is-filled' : 'is-empty'" clickable
+                    @click="openSheet('executionStandard')" :rightText="form.executionStandardName || '请选择'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text>执行标准</text></view>
+                    </template>
+                </uni-list-item>
                 <uni-list-item v-if="form.executionStandard === 'OTHER'" title="其他">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.executionStandardRemarks" placeholder="请输入其他标准备注"
                             :inputBorder="false" />
                     </template>
                 </uni-list-item>
-                <uni-list-item title="特别说明">
+                <uni-list-item title="特别说明" style="margin-top: 20rpx;">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.specialInstructions" placeholder="请输入特别说明" :inputBorder="false" />
                     </template>
@@ -181,23 +173,23 @@
                         数量
                     </div>
                     <div class="total-item-price">
-                        {{ (sumQuantity || 0).toFixed(2) }}t
+                        {{ (totalQuantity || 0).toFixed(2) }}kg
                     </div>
                 </div>
-                <div class="total-item">
+                <!-- <div class="total-item">
                     <div class="total-item-text">
                         不含税金额
                     </div>
                     <div class="total-item-price text-red">
-                        ￥{{ (sumAmountExcl || 0).toFixed(2) }}
+                        ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}
                     </div>
-                </div>
+                </div> -->
                 <div class="total-item">
                     <div class="total-item-text">
                         总金额
                     </div>
                     <div class="total-item-price text-red">
-                        ￥{{ (sumTotal || 0).toFixed(2) }}
+                        ￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}
                     </div>
                 </div>
             </div>
@@ -233,6 +225,7 @@ export default {
                 buyer: '',
                 buyerName: '',
                 orderDate: '',
+                deliveryDate: '',
                 designatedConsignee: '',
                 specialTerms: '',
                 specialTermsName: '',
@@ -243,7 +236,7 @@ export default {
                 includesPackagingFeeName: '',
                 includesTransportFee: false,
                 includesTransportFeeName: '',
-                unit: '元、公斤、元/公斤',
+                unit: '美元、公斤、美元/公斤',
                 totalAmountCapital: '',
                 destinationId: [],
                 destinationLabel: '',
@@ -263,9 +256,9 @@ export default {
             yesNoList: [{ label: '是', value: true }, { label: '否', value: false }],
             sheet: { visible: false, title: '请选择', field: '', options: [], value: '' },
             relate: { visible: false, title: '选择', source: '', display: [], multiple: false, rowKey: 'id', selectedKeys: [], fieldKey: '' },
-            sumQuantity: 0,
-            sumAmountExcl: 0,
-            sumTotal: 0,
+            totalQuantity: 0,
+            // totalAmountExcludingTax: 0,
+            totalAmountIncludingTax: 0,
             productLineList: [],
             productList: [],
             customerRemarks: [],
@@ -367,11 +360,11 @@ export default {
         onProductsChange(products) {
             const list = Array.isArray(products) ? products : []
             const sumQ = list.reduce((acc, it) => acc + (parseFloat(it.quantity) || 0), 0)
-            const sumE = list.reduce((acc, it) => acc + (parseFloat(it.amountExcludingTax) || 0), 0)
+            // const sumE = list.reduce((acc, it) => acc + (parseFloat(it.amountExcludingTax) || 0), 0)
             const sumT = list.reduce((acc, it) => acc + (parseFloat(it.totalAmount) || 0), 0)
-            this.sumQuantity = sumQ
-            this.sumAmountExcl = sumE
-            this.sumTotal = sumT
+            this.totalQuantity = sumQ
+            // this.totalAmountExcludingTax = sumE
+            this.totalAmountIncludingTax = sumT
             this.form.totalAmountCapital = formatCurrencyToChinese(sumT)
             this.productLineList = list
         },
@@ -447,6 +440,10 @@ export default {
                 setSheet('生产厂', opts)
             } else if (field === 'supplier') {
                 setSheet('供方', this.supplierList)
+            } else if (field === 'specialTerms') {
+                setSheet('特别条款要求', this.specialTermsList)
+            } else if (field === 'executionStandard') {
+                setSheet('执行标准', this.executionStandardList)
             } else if (field === 'includesPackagingFee') {
                 setSheet('单价中是否已包含包装费', this.yesNoList)
             } else if (field === 'includesTransportFee') {
@@ -517,9 +514,9 @@ export default {
                 ...formForSubmit,
                 destination,
                 type: 'INTL_INVENTORY_AGMT',
-                sumQuantity: this.sumQuantity,
-                sumAmountExcl: this.sumAmountExcl,
-                sumTotal: this.sumTotal,
+                totalQuantity: this.totalQuantity,
+                // totalAmountExcludingTax: this.totalAmountExcludingTax,
+                totalAmountIncludingTax: this.totalAmountIncludingTax,
                 contractDistributorLineList: lines
             })
             console.log('onSubmit__payload', payload)
@@ -538,18 +535,30 @@ export default {
                 { key: 'supplier', label: '供方' },
                 { key: 'buyer', label: '需方' },
                 { key: 'orderDate', label: '订货日期' },
+                { key: 'unit', label: '单位' },
                 { key: 'workshopId', label: '生产厂' },
+                { key: 'specialTerms', label: '特别条款要求' },
             ]
             for (const it of checks) {
                 const val = this.form[it.key]
                 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
                 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
             }
-            if (!Array.isArray(this.productLineList) || this.productLineList.length === 0) {
+            const list = Array.isArray(this.productLineList) ? this.productLineList : []
+            if (list.length === 0) {
                 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false
             }
-            for (const [idx, it] of this.productLineList.entries()) {
-                if (!it.productName || !it.quantity || !it.unitPrice) {
+            const strEmpty = (v) => (v === undefined || v === null || (typeof v === 'string' && v.trim() === ''))
+            const numEmpty = (v) => (v === undefined || v === null || v === '' || (typeof v === 'number' && isNaN(v)))
+            for (const [idx, it] of list.entries()) {
+                if (
+                    strEmpty(it.productName) ||
+                    strEmpty(it.industry) ||
+                    strEmpty(it.quality) ||
+                    strEmpty(it.brand) ||
+                    numEmpty(it.quantity) ||
+                    strEmpty(it.deliveryDate)
+                ) {
                     uni.showToast({ title: `第${idx + 1}条明细未完整填写`, icon: 'none' }); return false
                 }
             }
@@ -577,7 +586,7 @@ export default {
             color: rgba(0, 0, 0, 0.6);
             line-height: 32rpx;
             width: 240rpx;
-            padding: 24rpx 0;
+            padding: 12rpx 0;
         }
         .total-item-price {
             font-weight: 600;
@@ -599,7 +608,7 @@ export default {
 
 .scroll {
   flex: 1;
-  padding: 12rpx 0 480rpx !important;
+  padding: 12rpx 0 392rpx !important;
 }
 
 .footer {

@@ -53,13 +53,13 @@
                     }}</text></view>
                 </view>
 
-                <view class="section" v-if="status === 'STANDARD'">
+               <view class="section" v-if="detail.status === 'STANDARD'">
                     <view class="row"><text class="label">规范性合同</text><text class="value" style="color: #3D48A3;">{{
                         detail.standardFileName || '-' }}</text></view>
                     <view class="row"><text class="label">合同是否规范</text><text class="value">{{
                         detail.standardStandardized ? '是' : '否' }}</text></view>
                 </view>
-                <view class="section" v-if="status === 'FORMAL'">
+                <view class="section" v-if="detail.status === 'FORMAL'">
                     <view class="row"><text class="label">规范性合同</text><text class="value" style="color: #3D48A3;">{{
                         detail.formalFileName || '-' }}</text></view>
                     <view class="row"><text class="label">合同是否规范</text><text class="value">{{ detail.formalStandardized
@@ -265,19 +265,19 @@ export default {
             const e = this.detail.showExamine || false
             const f = this.detail.standardShowExamine || false
             return [
-                { ...this.buttons[0], visible: (s === 'DRAFT') }, //编辑
-                { ...this.buttons[1], visible: (s === 'DRAFT') }, //删除
-                { ...this.buttons[2], visible: (s === 'FORMAL' && !l) }, //锁价
-                { ...this.buttons[3], visible: ((s === 'DRAFT' || s === 'FORMAL') && t !== 'AUDIT' && t !== 'PASS') }, 
-                { ...this.buttons[4], visible: (s === 'STANDARD' && t !== 'AUDIT' && t !== 'PASS') }, 
-                { ...this.buttons[5], visible: (s === 'STANDARD' && a !== 'AUDIT' && a !== 'PASS') },
-                { ...this.buttons[6], visible: (s === 'FORMAL' && e && t === 'AUDIT') },
-                { ...this.buttons[7], visible: (s === 'STANDARD' && e && t === 'AUDIT') },
-                { ...this.buttons[8], visible: (s === 'STANDARD' && f && a === 'AUDIT') }, 
-                { ...this.buttons[9], visible: (s === 'FORMAL' && t) }, 
-                { ...this.buttons[10], visible: (s === 'STANDARD' && t) },
-                { ...this.buttons[11], visible: (s === 'STANDARD' && a) },
-                { ...this.buttons[12], visible: (s === 'STANDARD') }, 
+                { ...this.buttons[0], visible: (s === 'DRAFT' && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:modify')) }, //编辑
+                { ...this.buttons[1], visible: (s === 'DRAFT' && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:delete')) }, //删除
+                { ...this.buttons[2], visible: (s === 'FORMAL' && !l && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:lock')) }, //锁价
+                { ...this.buttons[3], visible: ((s === 'DRAFT' || s === 'FORMAL') && t !== 'AUDIT' && t !== 'PASS' && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:upload')) }, 
+                { ...this.buttons[4], visible: (s === 'STANDARD' && t !== 'AUDIT' && t !== 'PASS' && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:upload')) }, 
+                { ...this.buttons[5], visible: (s === 'STANDARD' && a !== 'AUDIT' && a !== 'PASS' && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:standard-upload')) },
+                { ...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[8], visible: (s === 'STANDARD' && f && a === 'AUDIT' && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:standard-approve')) }, 
+                { ...this.buttons[9], visible: (s === 'FORMAL' && t && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:review')) }, 
+                { ...this.buttons[10], visible: (s === 'STANDARD' && t && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:review')) },
+                { ...this.buttons[11], visible: (s === 'STANDARD' && a && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:standard-review')) },
+                { ...this.buttons[12], visible: (s === 'STANDARD' && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:upload-seal')) }, 
             ]
         }
     },

@@ -14,7 +14,7 @@
           @input="onSearchInput"
         />
         <view class="tool-icons">
-          <image class="tool-icon" src="/static/images/dev_manage/add_icon.png" @click="onAdd" />
+          <image v-if="$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:add')" class="tool-icon" src="/static/images/dev_manage/add_icon.png" @click="onAdd" />
           <image class="tool-icon" src="/static/images/dev_manage/filter_icon.png" @click="openFilter" />
         </view>
       </view>
@@ -61,7 +61,9 @@
               <text>订单总额</text><text class="amount" :style="{ color: '#b67a76' }">{{ item.totalAmountIncludingTax ? '¥' : '' }}{{ formatAmount(item.totalAmountIncludingTax) || '-' }}</text>
             </view>
             <view class="info-row" v-if="item.status === 'STANDARD' || item.status === 'FORMAL'">
-              <text>{{ item.status === 'STANDARD' ? '标准合同' : '正式合同' }}规范性审核状态</text><span class="info-status" :style="item.standardApprovedName ? getStatusCss(item.standardApprovedName) : ''">{{ item.standardApprovedName || '-' }}</span>
+              <text>{{ item.status === 'STANDARD' ? '标准合同' : '正式合同' }}规范性审核状态</text>
+              <span v-if="item.status === 'STANDARD' ? item.standardApprovedName : item.formalApprovedName" class="info-status" :style="getStatusCss(item.status === 'STANDARD' ? item.standardApprovedName : item.formalApprovedName)">{{ item.status === 'STANDARD' ? item.standardApprovedName : item.formalApprovedName }}</span>
+              <span v-else>-</span>
             </view>
             <view class="info-row">
               <text>订货日期</text><text>{{ item.orderDate }}</text>

@@ -108,23 +108,23 @@
                         数量
                     </div>
                     <div class="total-item-price">
-                        {{ (sumQuantity || 0).toFixed(2) }}t
+                        {{ (totalQuantity || 0).toFixed(2) }}kg
                     </div>
                 </div>
-                <div class="total-item">
+                <!-- <div class="total-item">
                     <div class="total-item-text">
                         不含税金额
                     </div>
                     <div class="total-item-price text-red">
-                        ￥{{ (sumAmountExcl || 0).toFixed(2) }}
+                        ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}
                     </div>
-                </div>
+                </div> -->
                 <div class="total-item">
                     <div class="total-item-text">
                         总金额
                     </div>
                     <div class="total-item-price text-red">
-                        ￥{{ (sumTotal || 0).toFixed(2) }}
+                        ￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}
                     </div>
                 </div>
             </div>
@@ -147,15 +147,15 @@ export default {
         }
     },
   computed: {
-        sumQuantity() {
+        totalQuantity() {
             const qty = this.items.filter(it => it.locked).reduce((p, c) => p + this.toNumber(c.quantity), 0)
             return this.round(qty, 2)
         },
-        sumAmountExcl() {
-            const sum = this.items.filter(it => it.locked).reduce((p, c) => p + this.toNumber(c.amountExcludingTax), 0)
-            return this.round(sum, 2)
-        },
-        sumTotal() { return this.totalAmount },
+        // totalAmountExcludingTax() {
+        //     const sum = this.items.filter(it => it.locked).reduce((p, c) => p + this.toNumber(c.amountExcludingTax), 0)
+        //     return this.round(sum, 2)
+        // },
+        totalAmountIncludingTax() { return this.totalAmount },
         totalAmount() {
             let sum = 0
             for (const it of this.items) {
@@ -213,7 +213,7 @@ export default {
                     status: v.status || '',
                     quantity: v.productQuantity || v.quantity || '',
                     unitPrice: v.unitPrice || '',
-                    amountExcludingTax: v.amountExcludingTax || 0,
+                    // amountExcludingTax: v.amountExcludingTax || 0,
                     totalAmount: v.totalAmount || 0,
                     deliveryDate: v.deliveryDate || '',
                     specDisplay: ''
@@ -255,8 +255,8 @@ export default {
             const qty = this.toNumber(it.quantity)
             const price = this.toNumber(it.unitPrice)
             const total = this.round(qty * price, 2)
-            const excl = this.round(total / (1 + TAX_RATE), 2)
-            it.amountExcludingTax = excl
+            // const excl = this.round(total / (1 + TAX_RATE), 2)
+            // it.amountExcludingTax = excl
             it.totalAmount = total
             this.$set(this.items, idx, it)
         },
@@ -292,7 +292,7 @@ export default {
                 ...it,
                 quantity: '',
                 unitPrice: '',
-                amountExcludingTax: 0
+                // amountExcludingTax: 0
             }))
         },
         async onSubmit() {
@@ -301,12 +301,12 @@ export default {
                 const qty = this.toNumber(it.quantity)
                 const price = this.toNumber(it.unitPrice)
                 const total = this.toNumber(it.totalAmount)
-                const excl = this.toNumber(it.amountExcludingTax)
+                // const excl = this.toNumber(it.amountExcludingTax)
                 if (Object.prototype.hasOwnProperty.call(raw, 'productQuantity')) raw.productQuantity = qty
                 else raw.quantity = qty
                 raw.unitPrice = price
                 raw.totalAmount = total
-                raw.amountExcludingTax = excl
+                // raw.amountExcludingTax = excl
                 return raw
             })
             if (!selected.length) {
@@ -325,9 +325,9 @@ export default {
             const payload = {
                 id: this.id,
                 totalAmountCapital: formatCurrencyToChinese(this.sumTotal),
-                totalAmountExcludingTax: this.sumAmountExcl,
-                totalAmountIncludingTax: this.sumTotal,
-                totalQuantity: this.sumQuantity,
+                // totalAmountExcludingTax: this.totalAmountExcludingTax,
+                totalAmountIncludingTax: this.totalAmountIncludingTax,
+                totalQuantity: this.totalQuantity,
                 type:'INTL_INVENTORY_AGMT',
                 contractDistributorLineList: selected
             }
@@ -362,7 +362,7 @@ export default {
 
 .scroll {
     flex: 1;
-    padding: 12rpx 0 480rpx !important;
+    padding: 12rpx 0 392rpx !important;
 }
 
 .header {
@@ -646,7 +646,7 @@ export default {
             color: rgba(0, 0, 0, 0.6);
             line-height: 32rpx;
             width: 240rpx;
-            padding: 24rpx 0;
+            padding: 12rpx 0;
         }
 
         .total-item-price {

@@ -41,7 +41,7 @@
                     </template>
                 </uni-list-item>
 
-                <ProductRel mode="add" :orderDateBase="form.orderDate" :list="productLineList" @change="onProductsChange" :options="productList" />
+                <ProductRel mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" :list="productLineList" @change="onProductsChange" :options="productList" />
 
                 <uni-list-item title="合计人民币金额（大写）">
                     <template v-slot:footer>
@@ -98,34 +98,25 @@
                             :inputBorder="false" />
                     </template>
                 </uni-list-item>
-
-                <view class="group">
-                    <view class="group-title">特别条款要求</view>
-                    <view class="radio-list">
-                        <view v-for="(opt, i) in specialTermsList" :key="'cr-' + i" class="radio-item"
-                            @click="onRadioSelect('specialTerms', 'specialTermsName', opt)">
-                            <view :class="['radio', { checked: form.specialTerms === opt.value }]" />
-                            <text class="label">{{ opt.label }}</text>
-                        </view>
-                    </view>
-                </view>
-                <view class="group">
-                    <view class="group-title">执行标准</view>
-                    <view class="radio-list">
-                        <view v-for="(opt, i) in executionStandardList" :key="'es-' + i" class="radio-item"
-                            @click="onRadioSelect('executionStandard', 'executionStandardName', opt)">
-                            <view :class="['radio', { checked: form.executionStandard === opt.value }]" />
-                            <text class="label">{{ opt.label }}</text>
-                        </view>
-                    </view>
-                </view>
+                <uni-list-item class="select-item" :class="form.specialTermsName ? 'is-filled' : 'is-empty'" clickable
+                    @click="openSheet('specialTerms')" :rightText="form.specialTermsName || '请选择'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text class="required">*</text><text>特别条款要求</text></view>
+                    </template>
+                </uni-list-item>
+                <uni-list-item class="select-item" :class="form.executionStandardName ? 'is-filled' : 'is-empty'" clickable
+                    @click="openSheet('executionStandard')" :rightText="form.executionStandardName || '请选择'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text>执行标准</text></view>
+                    </template>
+                </uni-list-item>
                 <uni-list-item v-if="form.executionStandard === 'OTHER'" title="其他">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.executionStandardRemarks" placeholder="请输入其他标准备注"
                             :inputBorder="false" />
                     </template>
                 </uni-list-item>
-                <uni-list-item title="特别说明">
+                <uni-list-item title="特别说明" style="margin-top: 20rpx;">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.specialInstructions" placeholder="请输入特别说明" :inputBorder="false" />
                     </template>
@@ -177,15 +168,15 @@
                 <div class="total-text">合计</div>
                 <div class="total-item">
                     <div class="total-item-text">数量</div>
-                    <div class="total-item-price">{{ (sumQuantity || 0).toFixed(2) }}t</div>
+                    <div class="total-item-price">{{ (totalQuantity || 0).toFixed(2) }}kg</div>
                 </div>
-                <div class="total-item">
+                <!-- <div class="total-item">
                     <div class="total-item-text">不含税金额</div>
-                    <div class="total-item-price text-red">￥{{ (sumAmountExcl || 0).toFixed(2) }}</div>
-                </div>
+                    <div class="total-item-price text-red">￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}</div>
+                </div> -->
                 <div class="total-item">
                     <div class="total-item-text">总金额</div>
-                    <div class="total-item-price text-red">￥{{ (sumTotal || 0).toFixed(2) }}</div>
+                    <div class="total-item-price text-red">￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}</div>
                 </div>
             </div>
             <button class="btn submit" type="primary" @click="onSubmit">保存</button>
@@ -223,6 +214,7 @@ export default {
                 workshopId: '',
                 workshopName: '',
                 orderDate: '',
+                deliveryDate: '',
                 designatedConsignee: '',
                 specialTerms: '',
                 specialTermsName: '',
@@ -233,7 +225,7 @@ export default {
                 includesPackagingFeeName: '',
                 includesTransportFee: false,
                 includesTransportFeeName: '',
-                unit: '元、公斤、元/公斤',
+                unit: '美元、公斤、美元/公斤',
                 totalAmountCapital: '',
                 depositInfo: '',
                 packagingRequirements: '',
@@ -256,9 +248,9 @@ export default {
             yesNoList: [{ label: '是', value: true }, { label: '否', value: false }],
             sheet: { visible: false, title: '请选择', field: '', options: [], value: '' },
             relate: { visible: false, title: '选择', source: '', display: [], multiple: false, rowKey: 'id', selectedKeys: [], fieldKey: '' },
-            sumQuantity: 0,
-            sumAmountExcl: 0,
-            sumTotal: 0,
+            totalQuantity: 0,
+            // totalAmountExcludingTax: 0,
+            totalAmountIncludingTax: 0,
             productLineList: [],
             newProductLineList: [],
             productList: []
@@ -347,11 +339,11 @@ export default {
             const list = Array.isArray(products) ? products : []
             this.newProductLineList = list
             const sumQ = list.reduce((acc, it) => acc + (parseFloat(it.quantity) || 0), 0)
-            const sumE = list.reduce((acc, it) => acc + (parseFloat(it.amountExcludingTax) || 0), 0)
+            // const sumE = list.reduce((acc, it) => acc + (parseFloat(it.amountExcludingTax) || 0), 0)
             const sumT = list.reduce((acc, it) => acc + (parseFloat(it.totalAmount) || 0), 0)
-            this.sumQuantity = sumQ
-            this.sumAmountExcl = sumE
-            this.sumTotal = sumT
+            this.totalQuantity = sumQ
+            // this.totalAmountExcludingTax = sumE
+            this.totalAmountIncludingTax = sumT
             this.form.totalAmountCapital = formatCurrencyToChinese(sumT)
         },
         async loadSuppliers() {
@@ -399,6 +391,10 @@ export default {
                 setSheet('生产厂', opts)
             } else if (field === 'supplier') {
                 setSheet('供方', this.supplierList)
+            } else if (field === 'specialTerms') {
+                setSheet('特别条款要求', this.specialTermsList)
+            } else if (field === 'executionStandard') {
+                setSheet('执行标准', this.executionStandardList)
             } else if (field === 'includesPackagingFee') {
                 setSheet('单价中是否已包含包装费', this.yesNoList)
             } else if (field === 'includesTransportFee') {
@@ -443,18 +439,30 @@ export default {
                 { key: 'supplier', label: '供方' },
                 { key: 'buyer', label: '需方' },
                 { key: 'orderDate', label: '订货日期' },
+                { key: 'unit', label: '单位' },
                 { key: 'workshopId', label: '生产厂' },
+                { key: 'specialTerms', label: '特别条款要求' },
             ]
             for (const it of checks) {
                 const val = this.form[it.key]
                 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
                 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
             }
-            if (!Array.isArray(this.productLineList) || this.productLineList.length === 0) {
+            const list = Array.isArray(this.newProductLineList) ? this.newProductLineList : []
+            if (list.length === 0) {
                 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false
             }
-            for (const [idx, it] of this.productLineList.entries()) {
-                if (!it.productName || !it.quantity || !it.unitPrice) {
+            const strEmpty = (v) => (v === undefined || v === null || (typeof v === 'string' && v.trim() === ''))
+            const numEmpty = (v) => (v === undefined || v === null || v === '' || (typeof v === 'number' && isNaN(v)))
+            for (const [idx, it] of list.entries()) {
+                if (
+                    strEmpty(it.productName) ||
+                    strEmpty(it.industry) ||
+                    strEmpty(it.quality) ||
+                    strEmpty(it.brand) ||
+                    numEmpty(it.quantity) ||
+                    strEmpty(it.deliveryDate)
+                ) {
                     uni.showToast({ title: `第${idx + 1}条明细未完整填写`, icon: 'none' }); return false
                 }
             }
@@ -486,9 +494,9 @@ export default {
                 id: this.form.id,
                 destination,
                 type: 'INTL_INVENTORY_AGMT',
-                sumQuantity: this.sumQuantity,
-                sumAmountExcl: this.sumAmountExcl,
-                sumTotal: this.sumTotal,
+                totalQuantity: this.totalQuantity,
+                // totalAmountExcludingTax: this.totalAmountExcludingTax,
+                totalAmountIncludingTax: this.totalAmountIncludingTax,
                 contractDistributorLineList: lines
             })
             try {
@@ -524,7 +532,7 @@ export default {
         color: rgba(0, 0, 0, 0.6);
         line-height: 32rpx;
         width: 240rpx;
-        padding: 24rpx 0;
+        padding: 12rpx 0;
     }
 
     .total-item-price {
@@ -547,7 +555,7 @@ export default {
 
 .scroll {
     flex: 1;
-    padding: 12rpx 0 480rpx !important;
+    padding: 12rpx 0 392rpx !important;
 }
 
 .footer {

@@ -53,53 +53,53 @@
                             <uni-easyinput v-model="item.quality" :inputBorder="false" placeholder="请输入品质" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="厚度">
+                    <uni-list-item title="厚度(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.thickness" :inputBorder="false" placeholder="请输入厚度" />
+                            <uni-easyinput type="digit" v-model="item.thickness" :inputBorder="false" placeholder="请输入厚度" @input="onNonNegativeInput(idx, 'thickness')" @blur="onNonNegativeBlur(idx, 'thickness', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="厚度公差(单项+)">
+                    <uni-list-item title="厚度公差上限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.thicknessTolPos" :inputBorder="false"
-                                placeholder="请输入厚度公差(单项+)" />
+                            <uni-easyinput type="digit" v-model="item.thicknessTolPos" :inputBorder="false"
+                                placeholder="请输入厚度公差上限" @input="onNonNegativeInput(idx, 'thicknessTolPos')" @blur="onNonNegativeBlur(idx, 'thicknessTolPos', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="厚度公差(单项-)">
+                    <uni-list-item title="厚度公差下限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.thicknessTolNeg" :inputBorder="false"
-                                placeholder="请输入厚度公差(单项-)" />
+                            <uni-easyinput type="digit" v-model="item.thicknessTolNeg" :inputBorder="false"
+                                placeholder="请输入厚度公差下限" @input="onNonNegativeInput(idx, 'thicknessTolNeg')" @blur="onNonNegativeBlur(idx, 'thicknessTolNeg', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="宽度">
+                    <uni-list-item title="宽度(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.width" :inputBorder="false" placeholder="请输入宽度" />
+                            <uni-easyinput type="digit" v-model="item.width" :inputBorder="false" placeholder="请输入宽度" @input="onNonNegativeInput(idx, 'width')" @blur="onNonNegativeBlur(idx, 'width', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="宽度公差(单项+)">
+                    <uni-list-item title="宽度公差上限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差(单项+)" />
+                            <uni-easyinput type="digit" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差(单项+)" @input="onNonNegativeInput(idx, 'widthTolPos')" @blur="onNonNegativeBlur(idx, 'widthTolPos', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="宽度公差(单项-)">
+                    <uni-list-item title="宽度公差下限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差(单项-)" />
+                            <uni-easyinput type="digit" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差下限" @input="onNonNegativeInput(idx, 'widthTolNeg')" @blur="onNonNegativeBlur(idx, 'widthTolNeg', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="长度">
+                    <uni-list-item title="长度(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.length" :inputBorder="false" placeholder="请输入长度" />
+                            <uni-easyinput type="digit" v-model="item.length" :inputBorder="false" placeholder="请输入长度" @input="onNonNegativeInput(idx, 'length')" @blur="onNonNegativeBlur(idx, 'length', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="长度公差(单项+)">
+                    <uni-list-item title="长度公差上限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.lengthTolPos" :inputBorder="false"
-                                placeholder="请输入长度公差(单项+)" />
+                            <uni-easyinput type="digit" v-model="item.lengthTolPos" :inputBorder="false"
+                                placeholder="请输入长度公差上限" @input="onNonNegativeInput(idx, 'lengthTolPos')" @blur="onNonNegativeBlur(idx, 'lengthTolPos', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="长度公差(单项-)">
+                    <uni-list-item title="长度公差下限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.lengthTolNeg" :inputBorder="false"
-                                placeholder="请输入长度公差(单项-)" />
+                            <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false"
+                                placeholder="请输入长度公差下限" @input="onNonNegativeInput(idx, 'lengthTolNeg')" @blur="onNonNegativeBlur(idx, 'lengthTolNeg', 2)" />
                         </template>
                     </uni-list-item>
                     <uni-list-item title="状态">
@@ -109,7 +109,7 @@
                     </uni-list-item>
                     <uni-list-item title="数量">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.quantity" type="number" :inputBorder="false" placeholder="请输入数量" @input="onImmediateChange(idx)" @blur="onNumberBlur(idx, 'quantity', 0)" />
+                            <uni-easyinput v-model="item.quantity" type="digit" :inputBorder="false" placeholder="请输入数量" @input="onNonNegativeInput(idx, 'quantity')" @blur="onNonNegativeBlur(idx, 'quantity', 2)" />
                         </template>
                     </uni-list-item>
                     <uni-list-item title="单价">
@@ -122,11 +122,11 @@
                             <uni-easyinput v-model="item.processingFee" type="number" :inputBorder="false" placeholder="请输入外贸加工费" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="不含税金额">
+                    <!-- <uni-list-item title="不含税金额">
                         <template v-slot:footer>
                             <uni-easyinput v-model="item.amountExcludingTax" type="number" :inputBorder="false" disabled placeholder="自动计算" />
                         </template>
-                    </uni-list-item>
+                    </uni-list-item> -->
                     <uni-list-item title="总金额">
                         <template v-slot:footer>
                             <uni-easyinput v-model="item.totalAmount" type="number" :inputBorder="false" disabled placeholder="自动计算" />
@@ -134,7 +134,7 @@
                     </uni-list-item>
                     <uni-list-item title="发货日期">
                         <template v-slot:footer>
-                            <uni-datetime-picker type="date" v-model="item.orderDate" @change="onDateChange(idx, $event)" />
+                            <uni-datetime-picker :start="minDeliveryDate" type="date" v-model="item.deliveryDate" @change="onDateChange(idx, $event)" />
                         </template>
                     </uni-list-item>
                 </uni-list>
@@ -156,18 +156,41 @@
                 <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>
                 <view class="row"><text class="label">品质</text><text class="value">{{ item.quality }}</text></view>
-                <view class="row"><text class="label">规格</text><text class="value">{{ item.specDisplay }}</text></view>
+          <!-- 厚（公差） * 宽（公差） * 长（公差） -->
+                    <view class="row row-spec"><text class="label">规格(mm)</text>
+                        <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 }}
+                                </view>
+                                <view v-if="item.thicknessTolNeg" class="value-spec_box_2">-{{ 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 }}</view>
+                                <view v-if="item.widthTolNeg" class="value-spec_box_2">-{{ 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 }}</view>
+                                <view v-if="item.lengthTolNeg" class="value-spec_box_2">-{{ item.lengthTolNeg }}</view>
+                            </view>
+                        </view>
+                    </view>
                 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view>
                 <view class="row"><text class="label">数量</text><text class="value">{{ item.quantity }}</text></view>
                 <view class="row"><text class="label">单价</text><text class="value">{{ formatCurrency(item.unitPrice)
                         }}</text>
                 </view>
-                <view class="row"><text class="label">不含税金额</text><text class="value">{{
+                <!-- <view class="row"><text class="label">不含税金额</text><text class="value">{{
                     formatCurrency(item.amountExcludingTax)
-                        }}</text></view>
+                        }}</text></view> -->
                 <view class="row"><text class="label">总金额</text><text class="value">{{ formatCurrency(item.totalAmount)
                         }}</text></view>
-                <view class="row"><text class="label">发货日期</text><text class="value">{{ item.orderDate }}</text></view>
+                <view class="row"><text class="label">发货日期</text><text class="value">{{ item.deliveryDate }}</text></view>
             </view>
         </view>
             <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value" @confirm="onProductConfirm" />
@@ -181,7 +204,8 @@ export default {
         mode: { type: String, default: 'add' },
         list: { type: Array, default: () => [] },
         max: { type: Number, default: 8 },
-        orderDateBase: { type: String, default: '' },
+        deliveryDateBase: { type: String, default: '' },
+        deliveryDate: { type: String, default: '' },
         options: { type: Array, default: () => [] }
     },
     components: { SingleSelectSheet },
@@ -192,15 +216,6 @@ export default {
       sheet: { visible: false, title: '请选择产品', options: [], value: '', idx: -1 }
     }
   },
-  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)
-      }))
-    }
-  },
   watch: {
     items: {
       handler() { this.emitChange() },
@@ -221,9 +236,44 @@ export default {
     this.items = init
     this.recalculateAll()
   },
+  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)
+      }))
+    },
+    minDeliveryDate() {
+        const s = this.deliveryDate
+        if (!s) return ''
+        const parts = String(s).split('-')
+        const y = Number(parts[0])
+        const m = Number(parts[1])
+        const d = Number(parts[2])
+        if (!y || !m || !d) return ''
+        const dt = new Date(y, m - 1, d)
+        dt.setDate(dt.getDate() + 1)
+        const yy = dt.getFullYear()
+        const mm = String(dt.getMonth() + 1).padStart(2, '0')
+        const dd = String(dt.getDate() - 1).padStart(2, '0')
+        return `${yy}/${mm}/${dd}`
+        }
+  },
   methods: {
         defaultItem() {
-            return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', processingFee: undefined, amountExcludingTax: 0, totalAmount: 0, orderDate: '' }
+            return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', processingFee: undefined, totalAmount: 0, deliveryDate: '' }
+        },
+       onNonNegativeInput(idx, field) {
+            const it = this.items[idx]
+            if (!it) return
+            let v = String(it[field] != null ? it[field] : '')
+            v = v.replace(/[^0-9.]/g, '')
+            v = v.replace(/(\..*)\./g, '$1')
+            if (v.startsWith('.')) v = '0' + v
+            it[field] = v
+            this.$set(this.items, idx, it)
+            if (field === 'quantity' || field === 'unitPrice') this.$nextTick(() => this.recalculate(idx))
         },
         onImmediateChange(idx) {
             this.$nextTick(() => this.recalculate(idx))
@@ -239,21 +289,21 @@ export default {
             const m = Math.pow(10, digits)
             return Math.round(n * m) / m
         },
-        onNumberBlur(idx, field, digits) {
+        onNonNegativeBlur(idx, field, digits) {
             const it = this.items[idx]
             if (!it) return
             const raw = it[field]
-            // 如果为空则保持为空，不自动置为0，仅重新计算依赖字段
             if (raw === '' || raw === null || raw === undefined) {
                 this.$set(this.items, idx, it)
-                this.recalculate(idx)
+                if (field === 'quantity' || field === 'unitPrice') this.recalculate(idx)
                 return
             }
-            const num = this.toNumber(raw)
+            let num = this.toNumber(raw)
+            if (isNaN(num) || num < 0) num = 0
             const rounded = this.round(num, digits)
             it[field] = rounded
             this.$set(this.items, idx, it)
-            this.recalculate(idx)
+            if (field === 'quantity' || field === 'unitPrice') this.recalculate(idx)
         },
         formatCurrency(val) {
             if (val == null || val === '') return ''
@@ -269,9 +319,9 @@ export default {
           return [t, w, l].filter(Boolean).join(' × ')
         },
         openProductSheet(idx) {
-            const opts = this.selectOptions
+            const opts = Array.isArray(this.selectOptions) ? this.selectOptions : []
             const current = this.items[idx] && this.items[idx].productId
-            const match = opts.find(o => o.value === current)
+            const match = (opts || []).find(o => String(o.value) === String(current))
             this.sheet = { ...this.sheet, visible: true, title: '请选择产品', options: opts, idx, value: match ? match.value : '' }
         },
         onProductConfirm({ value, label }) {
@@ -285,14 +335,14 @@ export default {
             this.emitChange()
         },
         recalculate(idx) {
-            const TAX_RATE = 0.13
+            // const TAX_RATE = 0.13
             const it = this.items[idx]
             if (!it) return
             const qty = this.toNumber(it.quantity)
             const price = this.toNumber(it.unitPrice)
             const total = this.round(qty * price, 2)
-            const excl = this.round(total / (1 + TAX_RATE), 2)
-            const next = { ...it, totalAmount: total, amountExcludingTax: excl }
+            // const excl = this.round(total / (1 + TAX_RATE), 2)
+            const next = { ...it, totalAmount: total }
             this.$set(this.items, idx, next)
         },
         recalculateAll() {
@@ -324,15 +374,15 @@ export default {
         onDateChange(idx, e) {
             const it = this.items[idx]
             if (!it) return
-            const val = typeof e === 'string' ? e : (e && e.detail && e.detail.value) ? e.detail.value : it.orderDate
+            const val = typeof e === 'string' ? e : (e && e.detail && e.detail.value) ? e.detail.value : it.deliveryDate
             const dateStr = String(val).slice(0, 10)
-            const base = this.orderDateBase ? new Date(this.orderDateBase) : null
+            const base = this.deliveryDateBase ? new Date(this.deliveryDateBase) : null
             const d = new Date(dateStr)
             if (base && !isNaN(d.getTime()) && d.getTime() < base.getTime()) {
                 uni.showToast({ title: '发货日期不得早于订货日期', icon: 'none' })
-                it.orderDate = this.orderDateBase
+                it.deliveryDate = this.deliveryDateBase
             } else {
-                it.orderDate = dateStr
+                it.deliveryDate = dateStr
             }
             this.$set(this.items, idx, it)
         },
@@ -505,8 +555,46 @@ export default {
 
 .value {
     flex: 1;
-    text-align: right;
+    // text-align: right;
     color: rgba(0, 0, 0, 0.9);
     font-size: 28rpx;
 }
+   .value-spec {
+        height: 48rpx;
+        display: flex;
+        align-items: center;
+        color: #000000;
+        // justify-content: end;
+        &_box {
+            position: relative;
+            width: 60rpx;
+            height: 48rpx;
+
+            &_1 {
+                font-size: 16rpx;
+                position: absolute;
+                top: -10rpx;
+                left: 0;
+            }
+
+            &_2 {
+                font-size: 16rpx;
+                position: absolute;
+                bottom: -10rpx;
+                left: 0;
+            }
+        }
+
+        &_val {
+            font-size: 28rpx;
+
+            &.p12 {
+                padding-right: 12rpx;
+            }
+        }
+    }
+        .row-spec {
+            height: 60rpx;
+            align-items: center;
+        }
 </style>

@@ -39,7 +39,7 @@
 						<view class="item-title"><text class="required">*</text><text>生产厂</text></view>
 					</template>
 				</uni-list-item>
-                <ProductRel mode="add" :orderDateBase="form.orderDate" @change="onProductsChange" :options="productList" />
+                <ProductRel mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" @change="onProductsChange" :options="productList" />
                 <uni-list-item title="合计人民币金额（大写）">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false" disabled />
@@ -92,33 +92,25 @@
                             :inputBorder="false" />
                     </template>
                 </uni-list-item>
-                <view class="group">
-                    <view class="group-title">特别条款要求</view>
-                    <view class="radio-list">
-                        <view v-for="(opt, i) in specialTermsList" :key="'cr-' + i" class="radio-item"
-                            @click="onRadioSelect('specialTerms', 'specialTermsName', opt)">
-                            <view :class="['radio', { checked: form.specialTerms === opt.value }]" />
-                            <text class="label">{{ opt.label }}</text>
-                        </view>
-                    </view>
-                </view>
-                <view class="group">
-                    <view class="group-title">执行标准</view>
-                    <view class="radio-list">
-                        <view v-for="(opt, i) in executionStandardList" :key="'es-' + i" class="radio-item"
-                            @click="onRadioSelect('executionStandard', 'executionStandardName', opt)">
-                            <view :class="['radio', { checked: form.executionStandard === opt.value }]" />
-                            <text class="label">{{ opt.label }}</text>
-                        </view>
-                    </view>
-                </view>
+                <uni-list-item class="select-item" :class="form.specialTermsName ? 'is-filled' : 'is-empty'" clickable
+                    @click="openSheet('specialTerms')" :rightText="form.specialTermsName || '请选择'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text class="required">*</text><text>特别条款要求</text></view>
+                    </template>
+                </uni-list-item>
+                <uni-list-item class="select-item" :class="form.executionStandardName ? 'is-filled' : 'is-empty'" clickable
+                    @click="openSheet('executionStandard')" :rightText="form.executionStandardName || '请选择'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text>执行标准</text></view>
+                    </template>
+                </uni-list-item>
                 <uni-list-item v-if="form.executionStandard === 'OTHER'" title="其他">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.executionStandardRemarks" placeholder="请输入其他标准备注"
                             :inputBorder="false" />
                     </template>
                 </uni-list-item>
-                <uni-list-item title="特别说明">
+                <uni-list-item title="特别说明" style="margin-top: 20rpx;">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.specialInstructions" placeholder="请输入特别说明" :inputBorder="false" />
                     </template>
@@ -180,24 +172,24 @@
                     <div class="total-item-text">
                         数量
                     </div>
-                    <div class="total-item-price">
-                        {{ (sumQuantity || 0).toFixed(2) }}t
+                 <div class="total-item-price">
+                        {{ (totalQuantity || 0).toFixed(2) }}kg
                     </div>
                 </div>
-                <div class="total-item">
+                <!-- <div class="total-item">
                     <div class="total-item-text">
                         不含税金额
                     </div>
                     <div class="total-item-price text-red">
-                        ￥{{ (sumAmountExcl || 0).toFixed(2) }}
+                        ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}
                     </div>
-                </div>
+                </div> -->
                 <div class="total-item">
                     <div class="total-item-text">
                         总金额
                     </div>
                     <div class="total-item-price text-red">
-                        ￥{{ (sumTotal || 0).toFixed(2) }}
+                        ￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}
                     </div>
                 </div>
             </div>
@@ -233,6 +225,7 @@ export default {
                 buyer: '',
                 buyerName: '',
                 orderDate: '',
+                deliveryDate: '',
                 designatedConsignee: '',
                 specialTerms: '',
                 specialTermsName: '',
@@ -243,7 +236,7 @@ export default {
                 includesPackagingFeeName: '',
                 includesTransportFee: false,
                 includesTransportFeeName: '',
-                unit: '元、公斤、元/公斤',
+                unit: '美元、公斤、美元/公斤',
                 totalAmountCapital: '',
                 destinationId: [],
                 destinationLabel: '',
@@ -263,9 +256,9 @@ export default {
             yesNoList: [{ label: '是', value: true }, { label: '否', value: false }],
             sheet: { visible: false, title: '请选择', field: '', options: [], value: '' },
             relate: { visible: false, title: '选择', source: '', display: [], multiple: false, rowKey: 'id', selectedKeys: [], fieldKey: '' },
-            sumQuantity: 0,
-            sumAmountExcl: 0,
-            sumTotal: 0,
+            totalQuantity: 0,
+            // totalAmountExcludingTax: 0,
+            totalAmountIncludingTax: 0,
             productLineList: [],
             productList: [],
             customerRemarks: [],
@@ -366,11 +359,11 @@ export default {
         onProductsChange(products) {
             const list = Array.isArray(products) ? products : []
             const sumQ = list.reduce((acc, it) => acc + (parseFloat(it.quantity) || 0), 0)
-            const sumE = list.reduce((acc, it) => acc + (parseFloat(it.amountExcludingTax) || 0), 0)
+            // const sumE = list.reduce((acc, it) => acc + (parseFloat(it.amountExcludingTax) || 0), 0)
             const sumT = list.reduce((acc, it) => acc + (parseFloat(it.totalAmount) || 0), 0)
-            this.sumQuantity = sumQ
-            this.sumAmountExcl = sumE
-            this.sumTotal = sumT
+            this.totalQuantity = sumQ
+            // this.totalAmountExcludingTax = sumE
+            this.totalAmountIncludingTax = sumT
             this.form.totalAmountCapital = formatCurrencyToChinese(sumT)
             this.productLineList = list
         },
@@ -446,6 +439,10 @@ export default {
                 setSheet('生产厂', opts)
             } else if (field === 'supplier') {
                 setSheet('供方', this.supplierList)
+            } else if (field === 'specialTerms') {
+                setSheet('特别条款要求', this.specialTermsList)
+            } else if (field === 'executionStandard') {
+                setSheet('执行标准', this.executionStandardList)
             } else if (field === 'includesPackagingFee') {
                 setSheet('单价中是否已包含包装费', this.yesNoList)
             } else if (field === 'includesTransportFee') {
@@ -516,9 +513,9 @@ export default {
                 ...formForSubmit,
                 destination,
                 type: 'INTL_OPEN_SPEC_AGMT',
-                sumQuantity: this.sumQuantity,
-                sumAmountExcl: this.sumAmountExcl,
-                sumTotal: this.sumTotal,
+                totalQuantity: this.totalQuantity,
+                // totalAmountExcludingTax: this.totalAmountExcludingTax,
+                totalAmountIncludingTax: this.totalAmountIncludingTax,
                 contractDistributorLineList: lines
             })
             console.log('onSubmit__payload', payload)
@@ -537,18 +534,31 @@ export default {
                 { key: 'supplier', label: '供方' },
                 { key: 'buyer', label: '需方' },
                 { key: 'orderDate', label: '订货日期' },
+                { key: 'unit', label: '单位' },
                 { key: 'workshopId', label: '生产厂' },
+                { key: 'specialTerms', label: '特别条款要求' },
             ]
             for (const it of checks) {
                 const val = this.form[it.key]
                 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
                 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
             }
-            if (!Array.isArray(this.productLineList) || this.productLineList.length === 0) {
+            const list = Array.isArray(this.productLineList) ? this.productLineList : []
+            if (list.length === 0) {
                 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false
             }
-            for (const [idx, it] of this.productLineList.entries()) {
-                if (!it.productName || !it.quantity || !it.unitPrice) {
+            const strEmpty = (v) => (v === undefined || v === null || (typeof v === 'string' && v.trim() === ''))
+            const numEmpty = (v) => (v === undefined || v === null || v === '' || (typeof v === 'number' && isNaN(v)))
+            for (const [idx, it] of list.entries()) {
+                if (
+                    strEmpty(it.productName) ||
+                    strEmpty(it.industry) ||
+                    strEmpty(it.quality) ||
+                    strEmpty(it.brand) ||
+                    numEmpty(it.quantity) ||
+                    numEmpty(it.unitPrice) ||
+                    strEmpty(it.deliveryDate)
+                ) {
                     uni.showToast({ title: `第${idx + 1}条明细未完整填写`, icon: 'none' }); return false
                 }
             }
@@ -576,7 +586,7 @@ export default {
             color: rgba(0, 0, 0, 0.6);
             line-height: 32rpx;
             width: 240rpx;
-            padding: 24rpx 0;
+            padding: 12rpx 0;
         }
         .total-item-price {
             font-weight: 600;
@@ -598,7 +608,7 @@ export default {
 
 .scroll {
   flex: 1;
-  padding: 12rpx 0 480rpx !important;
+  padding: 12rpx 0 392rpx !important;
 }
 
 .footer {

@@ -53,7 +53,7 @@
                     }}</text></view>
                 </view>
 
-                <view class="section">
+                <view class="section" v-if="detail.status === 'STANDARD'">
                     <view class="row"><text class="label">规范性合同</text><text class="value" style="color: #3D48A3;">{{
                         detail.standardFileName || '-'
                             }}</text></view>
@@ -61,7 +61,7 @@
                         detail.standardStandardized ? '是' : '否'
                             }}</text></view>
                 </view>
-                <view class="section" v-if="status === 'FORMAL'">
+                <view class="section" v-if="detail.status === 'FORMAL'">
                     <view class="row"><text class="label">规范性合同</text><text class="value" style="color: #3D48A3;">{{
                         detail.formalFileName || '-' }}</text></view>
                     <view class="row"><text class="label">合同是否规范</text><text class="value">{{ detail.formalStandardized
@@ -271,20 +271,20 @@ export default {
             const e = this.detail.showExamine || false
             const f = this.detail.standardShowExamine || false
             return [
-                { ...this.buttons[0], visible: (s === 'DRAFT') }, //编辑
-                { ...this.buttons[1], visible: (s === 'DRAFT') }, //删除
-                { ...this.buttons[2], visible: (s === 'FORMAL' && !l) }, //锁规
-                { ...this.buttons[3], visible: (s === 'FORMAL' && !l) }, //锁规延期申请
-                { ...this.buttons[4], visible: ((s === 'DRAFT' || s === 'FORMAL') && a !== 'AUDIT' && a !== 'PASS') }, //上传正式合同附件
-                { ...this.buttons[5], visible: (s === 'STANDARD' && a !== 'AUDIT' && a !== 'PASS') }, //上传正式合同附件
-                { ...this.buttons[6], visible: (s === 'STANDARD' && t !== 'AUDIT' && t !== 'PASS') },         //上传标准合同附件
-                { ...this.buttons[7], visible: (s === 'FORMAL' && e && a === 'AUDIT') }, //审核正式合同
-                { ...this.buttons[8], visible: (s === 'STANDARD' && e && a === 'AUDIT') }, //审核正式合同
-                { ...this.buttons[9], visible: (s === 'STANDARD' && f && t === 'AUDIT') },         //审核标准合同
-                { ...this.buttons[10], visible: (s === 'FORMAL' && a) }, //正式合同审核详情
-                { ...this.buttons[11], visible: (s === 'STANDARD' && a) }, //正式合同审核详情
-                { ...this.buttons[12], visible: (s === 'STANDARD' && t) },         //标准合同审核详情
-                { ...this.buttons[13], visible: (s === 'STANDARD') }, //上传双方盖章合同附件
+                { ...this.buttons[0], visible: (s === 'DRAFT' && this.$auth.hasPermi('contract-manage:foreign-trade-unlocked-contract:modify')) }, //编辑
+                { ...this.buttons[1], visible: (s === 'DRAFT' && this.$auth.hasPermi('contract-manage:foreign-trade-unlocked-contract:delete')) }, //删除
+                { ...this.buttons[2], visible: (s === 'FORMAL' && !l && this.$auth.hasPermi('contract-manage:foreign-trade-unlocked-contract:lock')) }, //锁规
+                { ...this.buttons[3], visible: (s === 'FORMAL' && !l && this.$auth.hasPermi('contract-manage:foreign-trade-unlocked-contract:lock-apply')) }, //锁规延期申请
+                { ...this.buttons[4], visible: ((s === 'DRAFT' || s === 'FORMAL') && a !== 'AUDIT' && a !== 'PASS' && this.$auth.hasPermi('contract-manage:foreign-trade-unlocked-contract:upload')) }, //上传正式合同附件
+                { ...this.buttons[5], visible: (s === 'STANDARD' && a !== 'AUDIT' && a !== 'PASS' && this.$auth.hasPermi('contract-manage:foreign-trade-unlocked-contract:upload')) }, //上传正式合同附件
+                { ...this.buttons[6], visible: (s === 'STANDARD' && t !== 'AUDIT' && t !== 'PASS' && this.$auth.hasPermi('contract-manage:foreign-trade-unlocked-contract:standard-upload')) },         //上传标准合同附件
+                { ...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[9], visible: (s === 'STANDARD' && f && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:foreign-trade-unlocked-contract:standard-approve')) },         //审核标准合同
+                { ...this.buttons[10], visible: (s === 'FORMAL' && a && this.$auth.hasPermi('contract-manage:foreign-trade-unlocked-contract:review')) }, //正式合同审核详情
+                { ...this.buttons[11], visible: (s === 'STANDARD' && a && this.$auth.hasPermi('contract-manage:foreign-trade-unlocked-contract:review')) }, //正式合同审核详情
+                { ...this.buttons[12], visible: (s === 'STANDARD' && t && this.$auth.hasPermi('contract-manage:foreign-trade-unlocked-contract:standard-review')) },         //标准合同审核详情
+                { ...this.buttons[13], visible: (s === 'STANDARD' && this.$auth.hasPermi('contract-manage:foreign-trade-unlcoked-contract:upload-seal')) }, //上传双方盖章合同附件
             ]
         }
     },

@@ -14,7 +14,7 @@
           @input="onSearchInput"
         />
         <view class="tool-icons">
-          <image class="tool-icon" src="/static/images/dev_manage/add_icon.png" @click="onAdd" />
+          <image v-if="$auth.hasPermi('contract-manage:foreign-trade-unlocked-contract:add')" class="tool-icon" src="/static/images/dev_manage/add_icon.png" @click="onAdd" />
           <image class="tool-icon" src="/static/images/dev_manage/filter_icon.png" @click="openFilter" />
         </view>
       </view>
@@ -61,7 +61,9 @@
               <text>订单总额</text><text class="amount" :style="{ color: '#b67a76' }">{{ item.totalAmountIncludingTax ? '¥' : '' }}{{ formatAmount(item.totalAmountIncludingTax) || '-' }}</text>
             </view>
             <view class="info-row" v-if="item.status === 'STANDARD' || item.status === 'FORMAL'">
-              <text>{{ item.status === 'STANDARD' ? '标准合同' : '正式合同' }}规范性审核状态</text><span class="info-status" :style="item.standardApprovedName ? getStatusCss(item.standardApprovedName) : ''">{{ item.standardApprovedName || '-' }}</span>
+              <text>{{ item.status === 'STANDARD' ? '标准合同' : '正式合同' }}规范性审核状态</text>
+              <span v-if="item.status === 'STANDARD' ? item.standardApprovedName : item.formalApprovedName" class="info-status" :style="getStatusCss(item.status === 'STANDARD' ? item.standardApprovedName : item.formalApprovedName)">{{ item.status === 'STANDARD' ? item.standardApprovedName : item.formalApprovedName }}</span>
+              <span v-else>-</span>            
             </view>
             <view class="info-row">
               <text>订货日期</text><text>{{ item.orderDate }}</text>

@@ -59,11 +59,11 @@
                                 <uni-easyinput v-model="item.unitPrice" type="number" :inputBorder="false" placeholder="请输入单价" @input="onImmediateChange(idx)" @blur="onNumberBlur(idx, 'unitPrice', 0)" />
                             </template>
                         </uni-list-item>
-                        <uni-list-item title="不含税金额">
+                        <!-- <uni-list-item title="不含税金额">
                             <template v-slot:footer>
                                 <uni-easyinput v-model="item.amountExcludingTax" type="number" :inputBorder="false" disabled placeholder="自动计算" />
                             </template>
-                        </uni-list-item>
+                        </uni-list-item> -->
                         <uni-list-item title="总金额">
                             <template v-slot:footer>
                                 <uni-easyinput v-model="item.totalAmount" type="number" :inputBorder="false" disabled placeholder="自动计算" />
@@ -107,23 +107,23 @@
                         数量
                     </div>
                     <div class="total-item-price">
-                        {{ (sumQuantity || 0).toFixed(2) }}t
+                        {{ (totalQuantity || 0).toFixed(2) }}kg
                     </div>
                 </div>
-                <div class="total-item">
+                <!-- <div class="total-item">
                     <div class="total-item-text">
                         不含税金额
                     </div>
                     <div class="total-item-price text-red">
-                        ￥{{ (sumAmountExcl || 0).toFixed(2) }}
+                        ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}
                     </div>
-                </div>
+                </div> -->
                 <div class="total-item">
                     <div class="total-item-text">
                         总金额
                     </div>
                     <div class="total-item-price text-red">
-                        ￥{{ (sumTotal || 0).toFixed(2) }}
+                        ￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}
                     </div>
                 </div>
             </div>
@@ -146,15 +146,15 @@ export default {
         }
     },
   computed: {
-        sumQuantity() {
+        totalQuantity() {
             const qty = this.items.filter(it => it.locked).reduce((p, c) => p + this.toNumber(c.quantity), 0)
             return this.round(qty, 2)
         },
-        sumAmountExcl() {
-            const sum = this.items.filter(it => it.locked).reduce((p, c) => p + this.toNumber(c.amountExcludingTax), 0)
-            return this.round(sum, 2)
-        },
-        sumTotal() { return this.totalAmount },
+        // totalAmountExcludingTax() {
+        //     const sum = this.items.filter(it => it.locked).reduce((p, c) => p + this.toNumber(c.amountExcludingTax), 0)
+        //     return this.round(sum, 2)
+        // },
+        totalAmountIncludingTax() { return this.totalAmount },
         totalAmount() {
             let sum = 0
             for (const it of this.items) {
@@ -212,7 +212,7 @@ export default {
                     status: v.status || '',
                     quantity: v.productQuantity || v.quantity || '',
                     unitPrice: v.unitPrice || '',
-                    amountExcludingTax: v.amountExcludingTax || 0,
+                    // amountExcludingTax: v.amountExcludingTax || 0,
                     totalAmount: v.totalAmount || 0,
                     deliveryDate: v.deliveryDate || '',
                     specDisplay: ''
@@ -248,14 +248,14 @@ export default {
             this.recalculate(idx)
         },
         recalculate(idx) {
-            const TAX_RATE = 0.13
+            // const TAX_RATE = 0.13
             const it = this.items[idx]
             if (!it) return
             const qty = this.toNumber(it.quantity)
             const price = this.toNumber(it.unitPrice)
             const total = this.round(qty * price, 2)
-            const excl = this.round(total / (1 + TAX_RATE), 2)
-            it.amountExcludingTax = excl
+            // const excl = this.round(total / (1 + TAX_RATE), 2)
+            // it.amountExcludingTax = excl
             it.totalAmount = total
             this.$set(this.items, idx, it)
         },
@@ -291,7 +291,7 @@ export default {
                 ...it,
                 quantity: '',
                 unitPrice: '',
-                amountExcludingTax: 0
+                // amountExcludingTax: 0,
             }))
         },
         async onSubmit() {
@@ -300,12 +300,12 @@ export default {
                 const qty = this.toNumber(it.quantity)
                 const price = this.toNumber(it.unitPrice)
                 const total = this.toNumber(it.totalAmount)
-                const excl = this.toNumber(it.amountExcludingTax)
+                // const excl = this.toNumber(it.amountExcludingTax)
                 if (Object.prototype.hasOwnProperty.call(raw, 'productQuantity')) raw.productQuantity = qty
                 else raw.quantity = qty
                 raw.unitPrice = price
                 raw.totalAmount = total
-                raw.amountExcludingTax = excl
+                // raw.amountExcludingTax = excl
                 return raw
             })
             if (!selected.length) {
@@ -325,9 +325,9 @@ export default {
             const payload = {
                 id: this.id,
                 totalAmountCapital: formatCurrencyToChinese(this.sumTotal),
-                totalAmountExcludingTax: this.sumAmountExcl,
-                totalAmountIncludingTax: this.sumTotal,
-                totalQuantity: this.sumQuantity,
+                // totalAmountExcludingTax: this.totalAmountExcludingTax,
+                totalAmountIncludingTax: this.totalAmountIncludingTax,
+                totalQuantity: this.totalQuantity,
                 type:'INTL_OPEN_SPEC_AGMT',
                 contractDistributorLineList: selected
             }
@@ -362,7 +362,7 @@ export default {
 
 .scroll {
     flex: 1;
-    padding: 12rpx 0 480rpx !important;
+    padding: 12rpx 0 392rpx !important;
 }
 
 .header {
@@ -646,7 +646,7 @@ export default {
             color: rgba(0, 0, 0, 0.6);
             line-height: 32rpx;
             width: 240rpx;
-            padding: 24rpx 0;
+            padding: 12rpx 0;
         }
 
         .total-item-price {

@@ -41,7 +41,7 @@
                     </template>
                 </uni-list-item>
 
-                <ProductRel mode="add" :orderDateBase="form.orderDate" :list="productLineList" @change="onProductsChange" :options="productList" />
+                <ProductRel mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" :list="productLineList" @change="onProductsChange" :options="productList" />
 
                 <uni-list-item title="合计人民币金额（大写）">
                     <template v-slot:footer>
@@ -98,34 +98,25 @@
                             :inputBorder="false" />
                     </template>
                 </uni-list-item>
-
-                <view class="group">
-                    <view class="group-title">特别条款要求</view>
-                    <view class="radio-list">
-                        <view v-for="(opt, i) in specialTermsList" :key="'cr-' + i" class="radio-item"
-                            @click="onRadioSelect('specialTerms', 'specialTermsName', opt)">
-                            <view :class="['radio', { checked: form.specialTerms === opt.value }]" />
-                            <text class="label">{{ opt.label }}</text>
-                        </view>
-                    </view>
-                </view>
-                <view class="group">
-                    <view class="group-title">执行标准</view>
-                    <view class="radio-list">
-                        <view v-for="(opt, i) in executionStandardList" :key="'es-' + i" class="radio-item"
-                            @click="onRadioSelect('executionStandard', 'executionStandardName', opt)">
-                            <view :class="['radio', { checked: form.executionStandard === opt.value }]" />
-                            <text class="label">{{ opt.label }}</text>
-                        </view>
-                    </view>
-                </view>
+                <uni-list-item class="select-item" :class="form.specialTermsName ? 'is-filled' : 'is-empty'" clickable
+                    @click="openSheet('specialTerms')" :rightText="form.specialTermsName || '请选择'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text class="required">*</text><text>特别条款要求</text></view>
+                    </template>
+                </uni-list-item>
+                <uni-list-item class="select-item" :class="form.executionStandardName ? 'is-filled' : 'is-empty'" clickable
+                    @click="openSheet('executionStandard')" :rightText="form.executionStandardName || '请选择'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text>执行标准</text></view>
+                    </template>
+                </uni-list-item>
                 <uni-list-item v-if="form.executionStandard === 'OTHER'" title="其他">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.executionStandardRemarks" placeholder="请输入其他标准备注"
                             :inputBorder="false" />
                     </template>
                 </uni-list-item>
-                <uni-list-item title="特别说明">
+                <uni-list-item title="特别说明" style="margin-top: 20rpx;">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.specialInstructions" placeholder="请输入特别说明" :inputBorder="false" />
                     </template>
@@ -177,15 +168,15 @@
                 <div class="total-text">合计</div>
                 <div class="total-item">
                     <div class="total-item-text">数量</div>
-                    <div class="total-item-price">{{ (sumQuantity || 0).toFixed(2) }}t</div>
+                    <div class="total-item-price">{{ (totalQuantity || 0).toFixed(2) }}kg</div>
                 </div>
-                <div class="total-item">
+                <!-- <div class="total-item">
                     <div class="total-item-text">不含税金额</div>
-                    <div class="total-item-price text-red">￥{{ (sumAmountExcl || 0).toFixed(2) }}</div>
-                </div>
+                    <div class="total-item-price text-red">￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}</div>
+                </div> -->
                 <div class="total-item">
                     <div class="total-item-text">总金额</div>
-                    <div class="total-item-price text-red">￥{{ (sumTotal || 0).toFixed(2) }}</div>
+                    <div class="total-item-price text-red">￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}</div>
                 </div>
             </div>
             <button class="btn submit" type="primary" @click="onSubmit">保存</button>
@@ -223,6 +214,7 @@ export default {
                 workshopId: '',
                 workshopName: '',
                 orderDate: '',
+                deliveryDate: '',
                 designatedConsignee: '',
                 specialTerms: '',
                 specialTermsName: '',
@@ -233,7 +225,7 @@ export default {
                 includesPackagingFeeName: '',
                 includesTransportFee: false,
                 includesTransportFeeName: '',
-                unit: '元、公斤、元/公斤',
+                unit: '美元、公斤、美元/公斤',
                 totalAmountCapital: '',
                 depositInfo: '',
                 packagingRequirements: '',
@@ -256,9 +248,9 @@ export default {
             yesNoList: [{ label: '是', value: true }, { label: '否', value: false }],
             sheet: { visible: false, title: '请选择', field: '', options: [], value: '' },
             relate: { visible: false, title: '选择', source: '', display: [], multiple: false, rowKey: 'id', selectedKeys: [], fieldKey: '' },
-            sumQuantity: 0,
-            sumAmountExcl: 0,
-            sumTotal: 0,
+            totalQuantity: 0,
+            // totalAmountExcludingTax: 0,
+            totalAmountIncludingTax: 0,
             productLineList: [],
             newProductLineList: [],
             productList: []
@@ -347,11 +339,11 @@ export default {
             const list = Array.isArray(products) ? products : []
             this.newProductLineList = list
             const sumQ = list.reduce((acc, it) => acc + (parseFloat(it.quantity) || 0), 0)
-            const sumE = list.reduce((acc, it) => acc + (parseFloat(it.amountExcludingTax) || 0), 0)
+            // const sumE = list.reduce((acc, it) => acc + (parseFloat(it.amountExcludingTax) || 0), 0)
             const sumT = list.reduce((acc, it) => acc + (parseFloat(it.totalAmount) || 0), 0)
-            this.sumQuantity = sumQ
-            this.sumAmountExcl = sumE
-            this.sumTotal = sumT
+            this.totalQuantity = sumQ
+            // this.totalAmountExcludingTax = sumE
+            this.totalAmountIncludingTax = sumT
             this.form.totalAmountCapital = formatCurrencyToChinese(sumT)
         },
         async loadSuppliers() {
@@ -399,6 +391,10 @@ export default {
                 setSheet('生产厂', opts)
             } else if (field === 'supplier') {
                 setSheet('供方', this.supplierList)
+            } else if (field === 'specialTerms') {
+                setSheet('特别条款要求', this.specialTermsList)
+            } else if (field === 'executionStandard') {
+                setSheet('执行标准', this.executionStandardList)
             } else if (field === 'includesPackagingFee') {
                 setSheet('单价中是否已包含包装费', this.yesNoList)
             } else if (field === 'includesTransportFee') {
@@ -443,18 +439,31 @@ export default {
                 { key: 'supplier', label: '供方' },
                 { key: 'buyer', label: '需方' },
                 { key: 'orderDate', label: '订货日期' },
+                { key: 'unit', label: '单位' },
                 { key: 'workshopId', label: '生产厂' },
+                { key: 'specialTerms', label: '特别条款要求' },
             ]
             for (const it of checks) {
                 const val = this.form[it.key]
                 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
                 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
             }
-            if (!Array.isArray(this.productLineList) || this.productLineList.length === 0) {
+            const list = Array.isArray(this.newProductLineList) ? this.newProductLineList : []
+            if (list.length === 0) {
                 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false
             }
-            for (const [idx, it] of this.productLineList.entries()) {
-                if (!it.productName || !it.quantity || !it.unitPrice) {
+            const strEmpty = (v) => (v === undefined || v === null || (typeof v === 'string' && v.trim() === ''))
+            const numEmpty = (v) => (v === undefined || v === null || v === '' || (typeof v === 'number' && isNaN(v)))
+            for (const [idx, it] of list.entries()) {
+                if (
+                    strEmpty(it.productName) ||
+                    strEmpty(it.industry) ||
+                    strEmpty(it.quality) ||
+                    strEmpty(it.brand) ||
+                    numEmpty(it.quantity) ||
+                    strEmpty(it.unitPrice) ||
+                    strEmpty(it.deliveryDate)
+                ) {
                     uni.showToast({ title: `第${idx + 1}条明细未完整填写`, icon: 'none' }); return false
                 }
             }
@@ -486,9 +495,9 @@ export default {
                 id: this.form.id,
                 destination,
                 type: 'INTL_OPEN_SPEC_AGMT',
-                sumQuantity: this.sumQuantity,
-                sumAmountExcl: this.sumAmountExcl,
-                sumTotal: this.sumTotal,
+                totalQuantity: this.totalQuantity,
+                // totalAmountExcludingTax: this.totalAmountExcludingTax,
+                totalAmountIncludingTax: this.totalAmountIncludingTax,
                 contractDistributorLineList: lines
             })
             try {
@@ -524,7 +533,7 @@ export default {
         color: rgba(0, 0, 0, 0.6);
         line-height: 32rpx;
         width: 240rpx;
-        padding: 24rpx 0;
+        padding: 12rpx 0;
     }
 
     .total-item-price {
@@ -547,7 +556,7 @@ export default {
 
 .scroll {
     flex: 1;
-    padding: 12rpx 0 480rpx !important;
+    padding: 12rpx 0 392rpx !important;
 }
 
 .footer {

@@ -53,53 +53,53 @@
                             <uni-easyinput v-model="item.quality" :inputBorder="false" placeholder="请输入品质" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="厚度">
+                    <uni-list-item title="厚度(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.thickness" :inputBorder="false" placeholder="请输入厚度" />
+                            <uni-easyinput type="digit" v-model="item.thickness" :inputBorder="false" placeholder="请输入厚度" @input="onNonNegativeInput(idx, 'thickness')" @blur="onNonNegativeBlur(idx, 'thickness', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="厚度公差(单项+)">
+                    <uni-list-item title="厚度公差上限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.thicknessTolPos" :inputBorder="false"
-                                placeholder="请输入厚度公差(单项+)" />
+                            <uni-easyinput type="digit" v-model="item.thicknessTolPos" :inputBorder="false"
+                                placeholder="请输入厚度公差上限" @input="onNonNegativeInput(idx, 'thicknessTolPos')" @blur="onNonNegativeBlur(idx, 'thicknessTolPos', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="厚度公差(单项-)">
+                    <uni-list-item title="厚度公差下限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.thicknessTolNeg" :inputBorder="false"
-                                placeholder="请输入厚度公差(单项-)" />
+                            <uni-easyinput type="digit" v-model="item.thicknessTolNeg" :inputBorder="false"
+                                placeholder="请输入厚度公差下限" @input="onNonNegativeInput(idx, 'thicknessTolNeg')" @blur="onNonNegativeBlur(idx, 'thicknessTolNeg', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="宽度">
+                    <uni-list-item title="宽度(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.width" :inputBorder="false" placeholder="请输入宽度" />
+                            <uni-easyinput type="digit" v-model="item.width" :inputBorder="false" placeholder="请输入宽度" @input="onNonNegativeInput(idx, 'width')" @blur="onNonNegativeBlur(idx, 'width', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="宽度公差(单项+)">
+                    <uni-list-item title="宽度公差上限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差(单项+)" />
+                            <uni-easyinput type="digit" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差上限" @input="onNonNegativeInput(idx, 'widthTolPos')" @blur="onNonNegativeBlur(idx, 'widthTolPos', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="宽度公差(单项-)">
+                    <uni-list-item title="宽度公差下限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差(单项-)" />
+                            <uni-easyinput type="digit" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差下限" @input="onNonNegativeInput(idx, 'widthTolNeg')" @blur="onNonNegativeBlur(idx, 'widthTolNeg', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="长度">
+                    <uni-list-item title="长度(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.length" :inputBorder="false" placeholder="请输入长度" />
+                            <uni-easyinput type="digit" v-model="item.length" :inputBorder="false" placeholder="请输入长度" @input="onNonNegativeInput(idx, 'length')" @blur="onNonNegativeBlur(idx, 'length', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="长度公差(单项+)">
+                    <uni-list-item title="长度公差上限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.lengthTolPos" :inputBorder="false"
-                                placeholder="请输入长度公差(单项+)" />
+                            <uni-easyinput type="digit" v-model="item.lengthTolPos" :inputBorder="false"
+                                placeholder="请输入长度公差上限" @input="onNonNegativeInput(idx, 'lengthTolPos')" @blur="onNonNegativeBlur(idx, 'lengthTolPos', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="长度公差(单项-)">
+                    <uni-list-item title="长度公差下限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.lengthTolNeg" :inputBorder="false"
-                                placeholder="请输入长度公差(单项-)" />
+                            <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false"
+                                placeholder="请输入长度公差下限" @input="onNonNegativeInput(idx, 'lengthTolNeg')" @blur="onNonNegativeBlur(idx, 'lengthTolNeg', 2)" />
                         </template>
                     </uni-list-item>
                     <uni-list-item title="状态">
@@ -109,19 +109,24 @@
                     </uni-list-item>
                     <uni-list-item title="数量">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.quantity" type="number" :inputBorder="false" placeholder="请输入数量" @input="onImmediateChange(idx)" @blur="onNumberBlur(idx, 'quantity', 0)" />
+                            <uni-easyinput v-model="item.quantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'quantity')" @blur="onNonNegativeBlur(idx, 'quantity', 2)" />
                         </template>
                     </uni-list-item>
                     <uni-list-item title="单价">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.unitPrice" type="number" :inputBorder="false" placeholder="请输入单价" @input="onImmediateChange(idx)" @blur="onNumberBlur(idx, 'unitPrice', 0)" />
+                            <uni-easyinput v-model="item.unitPrice" type="digit" :inputBorder="false" placeholder="请输入销售价格" @input="onNonNegativeInput(idx, 'unitPrice')" @blur="onNonNegativeBlur(idx, 'unitPrice', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="不含税金额">
+                    <uni-list-item title="外贸加工费">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.amountExcludingTax" type="number" :inputBorder="false" disabled placeholder="自动计算" />
+                            <uni-easyinput v-model="item.processingFee" type="number" :inputBorder="false" placeholder="请输入外贸加工费" />
                         </template>
                     </uni-list-item>
+                    <!-- <uni-list-item title="不含税金额">
+                        <template v-slot:footer>
+                            <uni-easyinput v-model="item.amountExcludingTax" type="number" :inputBorder="false" disabled placeholder="自动计算" />
+                        </template>
+                    </uni-list-item> -->
                     <uni-list-item title="总金额">
                         <template v-slot:footer>
                             <uni-easyinput v-model="item.totalAmount" type="number" :inputBorder="false" disabled placeholder="自动计算" />
@@ -129,7 +134,7 @@
                     </uni-list-item>
                     <uni-list-item title="发货日期">
                         <template v-slot:footer>
-                            <uni-datetime-picker type="date" v-model="item.orderDate" @change="onDateChange(idx, $event)" />
+                            <uni-datetime-picker :start="minDeliveryDate" type="date" v-model="item.deliveryDate" @change="onDateChange(idx, $event)" />
                         </template>
                     </uni-list-item>
                 </uni-list>
@@ -151,18 +156,41 @@
                 <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>
                 <view class="row"><text class="label">品质</text><text class="value">{{ item.quality }}</text></view>
-                <view class="row"><text class="label">规格</text><text class="value">{{ item.specDisplay }}</text></view>
+                    <!-- 厚（公差） * 宽（公差） * 长（公差） -->
+                    <view class="row row-spec"><text class="label">规格(mm)</text>
+                        <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 }}
+                                </view>
+                                <view v-if="item.thicknessTolNeg" class="value-spec_box_2">-{{ 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 }}</view>
+                                <view v-if="item.widthTolNeg" class="value-spec_box_2">-{{ 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 }}</view>
+                                <view v-if="item.lengthTolNeg" class="value-spec_box_2">-{{ item.lengthTolNeg }}</view>
+                            </view>
+                        </view>
+                    </view>
                 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view>
                 <view class="row"><text class="label">数量</text><text class="value">{{ item.quantity }}</text></view>
                 <view class="row"><text class="label">单价</text><text class="value">{{ formatCurrency(item.unitPrice)
                         }}</text>
                 </view>
-                <view class="row"><text class="label">不含税金额</text><text class="value">{{
+                <!-- <view class="row"><text class="label">不含税金额</text><text class="value">{{
                     formatCurrency(item.amountExcludingTax)
-                        }}</text></view>
+                        }}</text></view> -->
                 <view class="row"><text class="label">总金额</text><text class="value">{{ formatCurrency(item.totalAmount)
                         }}</text></view>
-                <view class="row"><text class="label">发货日期</text><text class="value">{{ item.orderDate }}</text></view>
+                <view class="row"><text class="label">发货日期</text><text class="value">{{ item.deliveryDate }}</text></view>
             </view>
         </view>
             <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value" @confirm="onProductConfirm" />
@@ -176,7 +204,8 @@ export default {
         mode: { type: String, default: 'add' },
         list: { type: Array, default: () => [] },
         max: { type: Number, default: 8 },
-        orderDateBase: { type: String, default: '' },
+        deliveryDateBase: { type: String, default: '' },
+        deliveryDate: { type: String, default: '' },
         options: { type: Array, default: () => [] }
     },
     components: { SingleSelectSheet },
@@ -194,6 +223,21 @@ export default {
         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)
       }))
+    },
+    minDeliveryDate() {
+      const s = this.deliveryDate
+      if (!s) return ''
+      const parts = String(s).split('-')
+      const y = Number(parts[0])
+      const m = Number(parts[1])
+      const d = Number(parts[2])
+      if (!y || !m || !d) return ''
+      const dt = new Date(y, m - 1, d)
+      dt.setDate(dt.getDate() + 1)
+      const yy = dt.getFullYear()
+      const mm = String(dt.getMonth() + 1).padStart(2, '0')
+      const dd = String(dt.getDate() - 1).padStart(2, '0')
+      return `${yy}/${mm}/${dd}`
     }
   },
   watch: {
@@ -218,10 +262,18 @@ export default {
   },
   methods: {
         defaultItem() {
-            return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, orderDate: '' }
+            return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', totalAmount: 0, deliveryDate: '' }
         },
-        onImmediateChange(idx) {
-            this.$nextTick(() => this.recalculate(idx))
+        onNonNegativeInput(idx, field) {
+            const it = this.items[idx]
+            if (!it) return
+            let v = String(it[field] != null ? it[field] : '')
+            v = v.replace(/[^0-9.]/g, '')
+            v = v.replace(/(\..*)\./g, '$1')
+            if (v.startsWith('.')) v = '0' + v
+            it[field] = v
+            this.$set(this.items, idx, it)
+            if (field === 'quantity' || field === 'unitPrice') this.$nextTick(() => this.recalculate(idx))
         },
         toNumber(val) {
             if (typeof val === 'number') return isNaN(val) ? 0 : val
@@ -234,21 +286,21 @@ export default {
             const m = Math.pow(10, digits)
             return Math.round(n * m) / m
         },
-        onNumberBlur(idx, field, digits) {
+        onNonNegativeBlur(idx, field, digits) {
             const it = this.items[idx]
             if (!it) return
             const raw = it[field]
-            // 如果为空则保持为空，不自动置为0，仅重新计算依赖字段
             if (raw === '' || raw === null || raw === undefined) {
                 this.$set(this.items, idx, it)
-                this.recalculate(idx)
+                if (field === 'quantity' || field === 'unitPrice') this.recalculate(idx)
                 return
             }
-            const num = this.toNumber(raw)
+            let num = this.toNumber(raw)
+            if (isNaN(num) || num < 0) num = 0
             const rounded = this.round(num, digits)
             it[field] = rounded
             this.$set(this.items, idx, it)
-            this.recalculate(idx)
+            if (field === 'quantity' || field === 'unitPrice') this.recalculate(idx)
         },
         formatCurrency(val) {
             if (val == null || val === '') return ''
@@ -286,8 +338,8 @@ export default {
             const qty = this.toNumber(it.quantity)
             const price = this.toNumber(it.unitPrice)
             const total = this.round(qty * price, 2)
-            const excl = this.round(total / (1 + TAX_RATE), 2)
-            const next = { ...it, totalAmount: total, amountExcludingTax: excl }
+            // const excl = this.round(total / (1 + TAX_RATE), 2)
+            const next = { ...it, totalAmount: total }
             this.$set(this.items, idx, next)
         },
         recalculateAll() {
@@ -319,15 +371,15 @@ export default {
         onDateChange(idx, e) {
             const it = this.items[idx]
             if (!it) return
-            const val = typeof e === 'string' ? e : (e && e.detail && e.detail.value) ? e.detail.value : it.orderDate
+            const val = typeof e === 'string' ? e : (e && e.detail && e.detail.value) ? e.detail.value : it.deliveryDate
             const dateStr = String(val).slice(0, 10)
-            const base = this.orderDateBase ? new Date(this.orderDateBase) : null
+            const base = this.deliveryDateBase ? new Date(this.deliveryDateBase) : null
             const d = new Date(dateStr)
             if (base && !isNaN(d.getTime()) && d.getTime() < base.getTime()) {
                 uni.showToast({ title: '发货日期不得早于订货日期', icon: 'none' })
-                it.orderDate = this.orderDateBase
+                it.deliveryDate = this.deliveryDateBase
             } else {
-                it.orderDate = dateStr
+                it.deliveryDate = dateStr
             }
             this.$set(this.items, idx, it)
         },
@@ -500,8 +552,46 @@ export default {
 
 .value {
     flex: 1;
-    text-align: right;
+    // text-align: right;
     color: rgba(0, 0, 0, 0.9);
     font-size: 28rpx;
 }
+   .value-spec {
+        height: 48rpx;
+        display: flex;
+        align-items: center;
+        color: #000000;
+        // justify-content: end;
+        &_box {
+            position: relative;
+            width: 60rpx;
+            height: 48rpx;
+
+            &_1 {
+                font-size: 16rpx;
+                position: absolute;
+                top: -10rpx;
+                left: 0;
+            }
+
+            &_2 {
+                font-size: 16rpx;
+                position: absolute;
+                bottom: -10rpx;
+                left: 0;
+            }
+        }
+
+        &_val {
+            font-size: 28rpx;
+
+            &.p12 {
+                padding-right: 12rpx;
+            }
+        }
+    }
+        .row-spec {
+            height: 60rpx;
+            align-items: center;
+        }
 </style>

@@ -34,8 +34,7 @@ export default {
   computed: {
     displayButtons() {
       return [
-        // { text: '删除', variant: 'danger' },
-        { text: '编辑', variant: 'outline' }
+        { text: '编辑', variant: 'outline', visible: this.$auth.hasPermi('contract-manage:contract-framework:modify') }
       ]
     }
   },

@@ -5,7 +5,7 @@
         <uni-search-bar v-model="searchKeyword" radius="6" placeholder="请输入客户名称或编号" clearButton="auto"
           cancelButton="none" bgColor="#F3F3F3" textColor="rgba(0,0,0,0.4)" @confirm="search" @input="onSearchInput" />
         <view class="tool-icons">
-          <image class="tool-icon" src="/static/images/dev_manage/add_icon.png" @click="onAdd" />
+          <image v-if="$auth.hasPermi('contract-manage:contract-framework:add')" class="tool-icon" src="/static/images/dev_manage/add_icon.png" @click="onAdd" />
           <image class="tool-icon" src="/static/images/dev_manage/filter_icon.png" @click="openFilter" />
         </view>
       </view>
@@ -24,7 +24,7 @@
               <text>框架合同编号</text><text>{{ item.code }}</text>
             </view>
             <view class="info-row">
-              <text>是否签订</text><text>{{ item.hasFrameworkAgreement }}</text>
+              <text>是否签订</text><text>{{ item.hasFrameworkAgreement ? '是' : '否' }}</text>
             </view>
             <view class="info-row">
               <text>品种</text><text>{{ item.materialTypeName }}</text>

@@ -39,7 +39,7 @@
 						<view class="item-title"><text class="required">*</text><text>生产厂</text></view>
 					</template>
 				</uni-list-item>
-                <!-- <ProductRel mode="add" :orderDateBase="form.orderDate" @change="onProductsChange" :options="productList" :rawToProdRatioList="rawToProdRatioList" /> -->
+                <ProductRel mode="add" :deliveryDateBase="form.deliveryDate" :deliveryDate="form.orderDate" @change="onProductsChange" :options="productList" :rawToProdRatioList="rawToProdRatioList" />
                 <uni-list-item title="合计人民币金额（大写）">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false" disabled />
@@ -92,33 +92,25 @@
                             :inputBorder="false" />
                     </template>
                 </uni-list-item>
-                <view class="group">
-                    <view class="group-title">特别条款要求</view>
-                    <view class="radio-list">
-                        <view v-for="(opt, i) in specialTermsList" :key="'cr-' + i" class="radio-item"
-                            @click="onRadioSelect('specialTerms', 'specialTermsName', opt)">
-                            <view :class="['radio', { checked: form.specialTerms === opt.value }]" />
-                            <text class="label">{{ opt.label }}</text>
-                        </view>
-                    </view>
-                </view>
-                <view class="group">
-                    <view class="group-title">执行标准</view>
-                    <view class="radio-list">
-                        <view v-for="(opt, i) in executionStandardList" :key="'es-' + i" class="radio-item"
-                            @click="onRadioSelect('executionStandard', 'executionStandardName', opt)">
-                            <view :class="['radio', { checked: form.executionStandard === opt.value }]" />
-                            <text class="label">{{ opt.label }}</text>
-                        </view>
-                    </view>
-                </view>
+                <uni-list-item class="select-item" :class="form.specialTermsName ? 'is-filled' : 'is-empty'" clickable
+                    @click="openSheet('specialTerms')" :rightText="form.specialTermsName || '请选择'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text class="required">*</text><text>特别条款要求</text></view>
+                    </template>
+                </uni-list-item>
+                <uni-list-item class="select-item" :class="form.executionStandardName ? 'is-filled' : 'is-empty'" clickable
+                    @click="openSheet('executionStandard')" :rightText="form.executionStandardName || '请选择'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text>执行标准</text></view>
+                    </template>
+                </uni-list-item>
                 <uni-list-item v-if="form.executionStandard === 'OTHER'" title="其他">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.executionStandardRemarks" placeholder="请输入其他标准备注"
                             :inputBorder="false" />
                     </template>
                 </uni-list-item>
-                <uni-list-item title="特别说明">
+                <uni-list-item title="特别说明" style="margin-top: 20rpx;">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.specialInstructions" placeholder="请输入特别说明" :inputBorder="false" />
                     </template>
@@ -181,7 +173,7 @@
                         数量
                     </div>
                     <div class="total-item-price">
-                        {{ (sumQuantity || 0).toFixed(2) }}t
+                        {{ (totalQuantity || 0).toFixed(2) }}kg
                     </div>
                 </div>
                 <div class="total-item">
@@ -189,7 +181,7 @@
                         不含税金额
                     </div>
                     <div class="total-item-price text-red">
-                        ￥{{ (sumAmountExcl || 0).toFixed(2) }}
+                        ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}
                     </div>
                 </div>
                 <div class="total-item">
@@ -197,7 +189,7 @@
                         总金额
                     </div>
                     <div class="total-item-price text-red">
-                        ￥{{ (sumTotal || 0).toFixed(2) }}
+                        ￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}
                     </div>
                 </div>
             </div>
@@ -214,7 +206,7 @@
 <script>
 import SingleSelectSheet from '@/components/single-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 { getRetailCodeApi, createContractApi, getCustomerRemarks,getCustomerSpecificQualityRequirements } from '@/api/contract'
 import { getDicByCodes } from '@/utils/dic'
@@ -223,7 +215,7 @@ import { workshopQueryApi } from '@/api/devManage'
 
 export default {
     name: 'AddContractProcess',
-    components: { SingleSelectSheet, RelateSelectSheet, /* ProductRel, */ CitySelector },
+    components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector },
     data() {
         return {
             form: {
@@ -233,6 +225,7 @@ export default {
                 buyer: '',
                 buyerName: '',
                 orderDate: '',
+                deliveryDate: '',
                 designatedConsignee: '',
                 specialTerms: '',
                 specialTermsName: '',
@@ -263,9 +256,9 @@ export default {
             yesNoList: [{ label: '是', value: true }, { label: '否', value: false }],
             sheet: { visible: false, title: '请选择', field: '', options: [], value: '' },
             relate: { visible: false, title: '选择', source: '', display: [], multiple: false, rowKey: 'id', selectedKeys: [], fieldKey: '' },
-            sumQuantity: 0,
-            sumAmountExcl: 0,
-            sumTotal: 0,
+            totalQuantity: 0,
+            totalAmountExcludingTax: 0,
+            totalAmountIncludingTax: 0,
             productLineList: [],
             productList: [],
             rawToProdRatioList: [],
@@ -313,8 +306,8 @@ export default {
                 const o = Array.isArray(oldVal) ? oldVal : []
                 const changed = []
                 for (let i = 0; i < n.length; i++) {
-                    const ni = n[i] && n[i].productId
-                    const oi = o[i] && o[i].productId
+                    const ni = n[i] && n[i].rawProductId
+                    const oi = o[i] && o[i].rawProductId
                     if (ni !== oi && ni !== undefined) changed.push(ni)
                 }
                 if (changed.length  && this.form.buyer) {
@@ -326,11 +319,11 @@ export default {
     },
     methods: {
         getHistory() {
-            console.log('this.productLineList', this.productLineList[0].productId)
-            if (!this.productLineList.length || !this.productLineList[0].productId) {
+            console.log('this.productLineList', this.productLineList[0].rawProductId)
+            if (!this.productLineList.length || !this.productLineList[0].rawProductId) {
                 return;
             }
-            const id = this.productLineList.map(it => it.productId).join('')
+            const id = this.productLineList.map(it => it.rawProductId).join('')
             this.fetchCustomerQualityRequirements(id)
         },
       async fetchCustomerQualityRequirements(id) {
@@ -366,12 +359,12 @@ export default {
       },
         onProductsChange(products) {
             const list = Array.isArray(products) ? products : []
-            const sumQ = list.reduce((acc, it) => acc + (parseFloat(it.quantity) || 0), 0)
+            const sumQ = list.reduce((acc, it) => acc + (parseFloat(it.productQuantity) || 0), 0)
             const sumE = list.reduce((acc, it) => acc + (parseFloat(it.amountExcludingTax) || 0), 0)
             const sumT = list.reduce((acc, it) => acc + (parseFloat(it.totalAmount) || 0), 0)
-            this.sumQuantity = sumQ
-            this.sumAmountExcl = sumE
-            this.sumTotal = sumT
+            this.totalQuantity = sumQ
+            this.totalAmountExcludingTax = sumE
+            this.totalAmountIncludingTax = sumT
             this.form.totalAmountCapital = formatCurrencyToChinese(sumT)
             this.productLineList = list
         },
@@ -450,6 +443,10 @@ export default {
                 setSheet('生产厂', opts)
             } else if (field === 'supplier') {
                 setSheet('承揽方', this.supplierList)
+            } else if (field === 'specialTerms') {
+                setSheet('特别条款要求', this.specialTermsList)
+            } else if (field === 'executionStandard') {
+                setSheet('执行标准', this.executionStandardList)
             } else if (field === 'includesPackagingFee') {
                 setSheet('单价中是否已包含包装费', this.yesNoList)
             } else if (field === 'includesTransportFee') {
@@ -520,10 +517,15 @@ export default {
                 ...formForSubmit,
                 destination,
                 type: 'PROCESS_STD_AGMT',
-                sumQuantity: this.sumQuantity,
-                sumAmountExcl: this.sumAmountExcl,
-                sumTotal: this.sumTotal,
-                contractDistributorLineList: lines
+                totalQuantity: this.totalQuantity,
+                totalAmountExcludingTax: this.totalAmountExcludingTax,
+                totalAmountIncludingTax: this.totalAmountIncludingTax,
+                contractStdProcessingLineList: lines.map(it => ({
+                    ...it,
+                    productId: it.rawProductId || '',
+                    productName: it.rawProductName || '',
+                    productGrade: it.rawProductGrade || '',
+                }))
             })
             console.log('onSubmit__payload', payload)
             
@@ -542,17 +544,30 @@ export default {
                 { key: 'buyer', label: '定作方' },
                 { key: 'orderDate', label: '订货日期' },
                 { key: 'workshopId', label: '生产厂' },
+                { key: 'unit', label: '单位' },
+                { key: 'specialTerms', label: '特别条款要求' },
             ]
             for (const it of checks) {
                 const val = this.form[it.key]
                 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
                 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
             }
-            if (!Array.isArray(this.productLineList) || this.productLineList.length === 0) {
+            const list = Array.isArray(this.productLineList) ? this.productLineList : []
+            if (list.length === 0) {
                 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false
             }
-            for (const [idx, it] of this.productLineList.entries()) {
-                if (!it.productName || !it.quantity || !it.unitPrice) {
+            const strEmpty = (v) => (v === undefined || v === null || (typeof v === 'string' && v.trim() === ''))
+            const numEmpty = (v) => (v === undefined || v === null || v === '' || (typeof v === 'number' && isNaN(v)))
+            for (const [idx, it] of list.entries()) {
+                if (
+                    strEmpty(it.rawProductName) ||
+                    strEmpty(it.industry) ||
+                    strEmpty(it.quality) ||
+                    strEmpty(it.rawProductGrade) ||
+                    numEmpty(it.productQuantity) ||
+                    numEmpty(it.unitPrice) ||
+                    strEmpty(it.deliveryDate)
+                ) {
                     uni.showToast({ title: `第${idx + 1}条明细未完整填写`, icon: 'none' }); return false
                 }
             }
@@ -580,7 +595,7 @@ export default {
             color: rgba(0, 0, 0, 0.6);
             line-height: 32rpx;
             width: 240rpx;
-            padding: 24rpx 0;
+            padding: 12rpx 0;
         }
         .total-item-price {
             font-weight: 600;
@@ -602,7 +617,7 @@ export default {
 
 .scroll {
   flex: 1;
-  padding: 12rpx 0 480rpx !important;
+  padding: 12rpx 0 392rpx !important;
 }
 
 .footer {

@@ -204,11 +204,11 @@ export default {
         const t = this.detail.standardApproved || false
         const e = this.detail.standardShowExamine || false
         return [
-          { ...this.buttons[0], visible: (s === 'DRAFT') },
-          { ...this.buttons[1], visible: (s === 'DRAFT')  },
-          { ...this.buttons[2], visible: (s !== 'DELETED' && t !== 'AUDIT' && t !== 'PASS') },
-          { ...this.buttons[3], visible: (s === 'STANDARD' && e && t === 'AUDIT') },
-          { ...this.buttons[4], visible: (s === 'STANDARD') }
+          { ...this.buttons[0], visible: (s === 'DRAFT' && this.$auth.hasPermi('contract-manage:processed-standard-contract:modify')) },
+          { ...this.buttons[1], visible: (s === 'DRAFT' && this.$auth.hasPermi('contract-manage:processed-standard-contract:delete'))  },
+          { ...this.buttons[2], visible: (s !== 'DELETED' && t !== 'AUDIT' && t !== 'PASS' && this.$auth.hasPermi('contract-manage:processed-standard-contract:upload')) },
+          { ...this.buttons[3], visible: (s === 'STANDARD' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:processed-standard-contract:approve')) },
+          { ...this.buttons[4], visible: (s === 'STANDARD' && this.$auth.hasPermi('contract-manage:processed-standard-contract:review')) }
         ]
       }
     },

@@ -14,7 +14,7 @@
           @input="onSearchInput"
         />
         <view class="tool-icons">
-          <image class="tool-icon" src="/static/images/dev_manage/add_icon.png" @click="onAdd" />
+          <image v-if="$auth.hasPermi('contract-manage:processed-standard-contract:add')" class="tool-icon" src="/static/images/dev_manage/add_icon.png" @click="onAdd" />
           <image class="tool-icon" src="/static/images/dev_manage/filter_icon.png" @click="openFilter" />
         </view>
       </view>
@@ -206,7 +206,7 @@ export default {
       if (!this.batchMode) this.selectedKeys = []
     },
     onAdd() {
-      uni.showToast({ title: '点击新增', icon: 'none' })
+      uni.navigateTo({ url: '/pages/contract_process/add' })
     },
     fetchList({ pageIndex, pageSize, query, extra }) {
         console.log('fetchList', pageIndex, pageSize, query, extra)

@@ -41,7 +41,7 @@
                     </template>
                 </uni-list-item>
 
-                <ProductRel mode="add" :orderDateBase="form.orderDate" :list="productLineList" @change="onProductsChange" :options="productList" />
+                <ProductRel mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" :list="productLineList" @change="onProductsChange" :options="productList" />
 
                 <uni-list-item title="合计人民币金额（大写）">
                     <template v-slot:footer>
@@ -99,33 +99,25 @@
                     </template>
                 </uni-list-item>
 
-                <view class="group">
-                    <view class="group-title">特别条款要求</view>
-                    <view class="radio-list">
-                        <view v-for="(opt, i) in specialTermsList" :key="'cr-' + i" class="radio-item"
-                            @click="onRadioSelect('specialTerms', 'specialTermsName', opt)">
-                            <view :class="['radio', { checked: form.specialTerms === opt.value }]" />
-                            <text class="label">{{ opt.label }}</text>
-                        </view>
-                    </view>
-                </view>
-                <view class="group">
-                    <view class="group-title">执行标准</view>
-                    <view class="radio-list">
-                        <view v-for="(opt, i) in executionStandardList" :key="'es-' + i" class="radio-item"
-                            @click="onRadioSelect('executionStandard', 'executionStandardName', opt)">
-                            <view :class="['radio', { checked: form.executionStandard === opt.value }]" />
-                            <text class="label">{{ opt.label }}</text>
-                        </view>
-                    </view>
-                </view>
+                <uni-list-item class="select-item" :class="form.specialTermsName ? 'is-filled' : 'is-empty'" clickable
+                    @click="openSheet('specialTerms')" :rightText="form.specialTermsName || '请选择'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text class="required">*</text><text>特别条款要求</text></view>
+                    </template>
+                </uni-list-item>
+                <uni-list-item class="select-item" :class="form.executionStandardName ? 'is-filled' : 'is-empty'" clickable
+                    @click="openSheet('executionStandard')" :rightText="form.executionStandardName || '请选择'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text>执行标准</text></view>
+                    </template>
+                </uni-list-item>
                 <uni-list-item v-if="form.executionStandard === 'OTHER'" title="其他">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.executionStandardRemarks" placeholder="请输入其他标准备注"
                             :inputBorder="false" />
                     </template>
                 </uni-list-item>
-                <uni-list-item title="特别说明">
+                <uni-list-item title="特别说明" style="margin-top: 20rpx;">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.specialInstructions" placeholder="请输入特别说明" :inputBorder="false" />
                     </template>
@@ -177,15 +169,15 @@
                 <div class="total-text">合计</div>
                 <div class="total-item">
                     <div class="total-item-text">数量</div>
-                    <div class="total-item-price">{{ (sumQuantity || 0).toFixed(2) }}t</div>
+                     <div class="total-item-price">{{ (totalQuantity || 0).toFixed(2) }}kg</div>
                 </div>
                 <div class="total-item">
                     <div class="total-item-text">不含税金额</div>
-                    <div class="total-item-price text-red">￥{{ (sumAmountExcl || 0).toFixed(2) }}</div>
+                    <div class="total-item-price text-red">￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}</div>
                 </div>
                 <div class="total-item">
                     <div class="total-item-text">总金额</div>
-                    <div class="total-item-price text-red">￥{{ (sumTotal || 0).toFixed(2) }}</div>
+                    <div class="total-item-price text-red">￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}</div>
                 </div>
             </div>
             <button class="btn submit" type="primary" @click="onSubmit">保存</button>
@@ -223,6 +215,7 @@ export default {
                 workshopId: '',
                 workshopName: '',
                 orderDate: '',
+                deliveryDate: '',
                 designatedConsignee: '',
                 specialTerms: '',
                 specialTermsName: '',
@@ -256,9 +249,9 @@ export default {
             yesNoList: [{ label: '是', value: true }, { label: '否', value: false }],
             sheet: { visible: false, title: '请选择', field: '', options: [], value: '' },
             relate: { visible: false, title: '选择', source: '', display: [], multiple: false, rowKey: 'id', selectedKeys: [], fieldKey: '' },
-            sumQuantity: 0,
-            sumAmountExcl: 0,
-            sumTotal: 0,
+            totalQuantity: 0,
+            totalAmountExcludingTax: 0,
+            totalAmountIncludingTax: 0,
             productLineList: [],
             newProductLineList: [],
             productList: [],
@@ -325,7 +318,7 @@ export default {
                     workshopId: m.workshopId || '',
                     workshopName: m.workshopName || '',
                 }
-                const lines = Array.isArray(m.contractDistributorLineList) ? m.contractDistributorLineList : []
+                const lines = Array.isArray(m.contractStdProcessingLineList) ? m.contractStdProcessingLineList : []
                 this.productLineList = lines
                 this.onProductsChange(lines)
             } catch (e) { }
@@ -347,12 +340,12 @@ export default {
         onProductsChange(products) {
             const list = Array.isArray(products) ? products : []
             this.newProductLineList = list
-            const sumQ = list.reduce((acc, it) => acc + (parseFloat(it.quantity) || 0), 0)
+            const sumQ = list.reduce((acc, it) => acc + (parseFloat(it.productQuantity) || 0), 0)
             const sumE = list.reduce((acc, it) => acc + (parseFloat(it.amountExcludingTax) || 0), 0)
             const sumT = list.reduce((acc, it) => acc + (parseFloat(it.totalAmount) || 0), 0)
-            this.sumQuantity = sumQ
-            this.sumAmountExcl = sumE
-            this.sumTotal = sumT
+            this.totalQuantity = sumQ
+            this.totalAmountExcludingTax = sumE
+            this.totalAmountIncludingTax = sumT
             this.form.totalAmountCapital = formatCurrencyToChinese(sumT)
         },
         async loadSuppliers() {
@@ -403,6 +396,10 @@ export default {
                 setSheet('生产厂', opts)
             } else if (field === 'supplier') {
                 setSheet('承揽方', this.supplierList)
+            } else if (field === 'specialTerms') {
+                setSheet('特别条款要求', this.specialTermsList)
+            } else if (field === 'executionStandard') {
+                setSheet('执行标准', this.executionStandardList)
             } else if (field === 'includesPackagingFee') {
                 setSheet('单价中是否已包含包装费', this.yesNoList)
             } else if (field === 'includesTransportFee') {
@@ -448,17 +445,30 @@ export default {
                 { key: 'buyer', label: '定作方' },
                 { key: 'orderDate', label: '订货日期' },
                 { key: 'workshopId', label: '生产厂' },
+                { key: 'unit', label: '单位' },
+                { key: 'specialTerms', label: '特别条款要求' },
             ]
             for (const it of checks) {
                 const val = this.form[it.key]
                 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
                 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
             }
-            if (!Array.isArray(this.productLineList) || this.productLineList.length === 0) {
+            const list = Array.isArray(this.newProductLineList) ? this.newProductLineList : []
+            if (list.length === 0) {
                 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false
             }
-            for (const [idx, it] of this.productLineList.entries()) {
-                if (!it.productName || !it.quantity || !it.unitPrice) {
+            const strEmpty = (v) => (v === undefined || v === null || (typeof v === 'string' && v.trim() === ''))
+            const numEmpty = (v) => (v === undefined || v === null || v === '' || (typeof v === 'number' && isNaN(v)))
+            for (const [idx, it] of list.entries()) {
+                if (
+                    strEmpty(it.productName) ||
+                    strEmpty(it.industry) ||
+                    strEmpty(it.quality) ||
+                    strEmpty(it.brand) ||
+                    numEmpty(it.productQuantity) ||
+                    strEmpty(it.unitPrice) ||
+                    strEmpty(it.deliveryDate)
+                ) {
                     uni.showToast({ title: `第${idx + 1}条明细未完整填写`, icon: 'none' }); return false
                 }
             }
@@ -493,7 +503,7 @@ export default {
                 sumQuantity: this.sumQuantity,
                 sumAmountExcl: this.sumAmountExcl,
                 sumTotal: this.sumTotal,
-                contractDistributorLineList: lines
+                contractStdProcessingLineList: lines
             })
             try {
                 await updateContractApi(payload)
@@ -528,7 +538,7 @@ export default {
         color: rgba(0, 0, 0, 0.6);
         line-height: 32rpx;
         width: 240rpx;
-        padding: 24rpx 0;
+        padding: 12rpx 0;
     }
 
     .total-item-price {
@@ -551,7 +561,7 @@ export default {
 
 .scroll {
     flex: 1;
-    padding: 12rpx 0 480rpx !important;
+    padding: 12rpx 0 392rpx !important;
 }
 
 .footer {

@@ -38,7 +38,7 @@
                             <view class="item-title"><text>原材料名称</text></view>
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="原材料牌号">
+                    <uni-list-item title="原材料牌号">  
                         <template v-slot:footer>
                             <uni-easyinput v-model="item.rawProductGrade" :inputBorder="false" placeholder="请输入原材料牌号" />
                         </template>
@@ -58,74 +58,90 @@
                             <uni-easyinput v-model="item.supplyTime" :inputBorder="false" placeholder="请输入原材料提供时间" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item class="select-item" :class="item.rawToProdRatioName ? 'is-filled' : 'is-empty'" clickable @click="openRawToProdRatioSheet(idx)" :rightText="item.rawToProdRatioName || '请选择原材料到产品的转换比例'" showArrow>
+                    <uni-list-item class="select-item" :class="item.rawToProdRatioName ? 'is-filled' : 'is-empty'" clickable @click="openRawToProdRatioSheet(idx)" :rightText="item.rawToProdRatioName || '请选择原材料与产品数量比'" showArrow>
+                        <template v-slot:body>
+                            <view class="item-title"><text>原材料与产品数量比</text></view>
+                        </template>
+                    </uni-list-item>
+                    <uni-list-item title="原材料与产品数量比备注">
+                        <template v-slot:footer>
+                            <uni-easyinput v-model="item.materialProductRatioRemarks" :disabled="item.materialProductRatio !== '10'" :inputBorder="false" placeholder="请输入原材料与产品数量比备注" />
+                        </template>
+                    </uni-list-item>
+
+                    <uni-list-item class="select-item" :class="item.productName ? 'is-filled' : 'is-empty'" clickable @click="openProductTargetSheet(idx)" :rightText="item.productName || '请选择定作物名称'" showArrow>
                         <template v-slot:body>
-                            <view class="item-title"><text>原材料到产品的转换比例</text></view>
+                            <view class="item-title"><text>定作物名称</text></view>
+                        </template>
+                    </uni-list-item>
+                    <uni-list-item title="定作物牌号">
+                        <template v-slot:footer>
+                            <uni-easyinput v-model="item.productGrade"  :inputBorder="false" placeholder="请输入定作物牌号" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="原材料到产品的转换比例备注">
+                    <uni-list-item title="状态">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.materialProductRatioRemarks" :disabled="item.materialProductRatio !== '10'" :inputBorder="false" placeholder="请输入原材料到产品的转换比例备注" />
+                            <uni-easyinput v-model="item.productStatus"  :inputBorder="false" placeholder="请输入状态" />
                         </template>
                     </uni-list-item>
                     
-                    <uni-list-item title="厚度">
+                    <uni-list-item title="厚度(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.thickness" :inputBorder="false" placeholder="请输入厚度" />
+                            <uni-easyinput type="digit" v-model="item.thickness" :inputBorder="false" placeholder="请输入厚度" @input="onNonNegativeInput(idx, 'thickness')" @blur="onNonNegativeBlur(idx, 'thickness', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="厚度公差(单项+)">
+                    <uni-list-item title="厚度公差上限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.thicknessTolPos" :inputBorder="false"
-                                placeholder="请输入厚度公差(单项+)" />
+                            <uni-easyinput type="digit" v-model="item.thicknessTolPos" :inputBorder="false"
+                                placeholder="请输入厚度公差上限" @input="onNonNegativeInput(idx, 'thicknessTolPos')" @blur="onNonNegativeBlur(idx, 'thicknessTolPos', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="厚度公差(单项-)">
+                    <uni-list-item title="厚度公差下限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.thicknessTolNeg" :inputBorder="false"
-                                placeholder="请输入厚度公差(单项-)" />
+                            <uni-easyinput type="digit" v-model="item.thicknessTolNeg" :inputBorder="false"
+                                placeholder="请输入厚度公差下限" @input="onNonNegativeInput(idx, 'thicknessTolNeg')" @blur="onNonNegativeBlur(idx, 'thicknessTolNeg', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="宽度">
+                    <uni-list-item title="宽度(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.width" :inputBorder="false" placeholder="请输入宽度" />
+                            <uni-easyinput type="digit" v-model="item.width" :inputBorder="false" placeholder="请输入宽度" @input="onNonNegativeInput(idx, 'width')" @blur="onNonNegativeBlur(idx, 'width', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="宽度公差(单项+)">
+                    <uni-list-item title="宽度公差上限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差(单项+)" />
+                            <uni-easyinput type="digit" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差上限" @input="onNonNegativeInput(idx, 'widthTolPos')" @blur="onNonNegativeBlur(idx, 'widthTolPos', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="宽度公差(单项-)">
+                    <uni-list-item title="宽度公差下限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差(单项-)" />
+                            <uni-easyinput type="digit" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差下限" @input="onNonNegativeInput(idx, 'widthTolNeg')" @blur="onNonNegativeBlur(idx, 'widthTolNeg', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="长度">
+                    <uni-list-item title="长度(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.length" :inputBorder="false" placeholder="请输入长度" />
+                            <uni-easyinput type="digit" v-model="item.length" :inputBorder="false" placeholder="请输入长度" @input="onNonNegativeInput(idx, 'length')" @blur="onNonNegativeBlur(idx, 'length', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="长度公差(单项+)">
+                    <uni-list-item title="长度公差上限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.lengthTolPos" :inputBorder="false"
-                                placeholder="请输入长度公差(单项+)" />
+                            <uni-easyinput type="digit" v-model="item.lengthTolPos" :inputBorder="false"
+                                placeholder="请输入长度公差上限" @input="onNonNegativeInput(idx, 'lengthTolPos')" @blur="onNonNegativeBlur(idx, 'lengthTolPos', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="长度公差(单项-)">
+                    <uni-list-item title="长度公差下限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.lengthTolNeg" :inputBorder="false"
-                                placeholder="请输入长度公差(单项-)" />
+                            <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false"
+                                placeholder="请输入长度公差下限" @input="onNonNegativeInput(idx, 'lengthTolNeg')" @blur="onNonNegativeBlur(idx, 'lengthTolNeg', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="定做物数量">
+                    <uni-list-item title="定作物数量">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.productQuantity" type="number" :inputBorder="false" placeholder="请输入数量" @input="onImmediateChange(idx)" @blur="onNumberBlur(idx, 'productQuantity', 0)" />
+                            <uni-easyinput v-model="item.productQuantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'productQuantity')" @blur="onNonNegativeBlur(idx, 'productQuantity', 2)" />
                         </template>
                     </uni-list-item>
                     <uni-list-item title="加工费单价">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.unitPrice" type="number" :inputBorder="false" placeholder="请输入单价" @input="onImmediateChange(idx)" @blur="onNumberBlur(idx, 'unitPrice', 0)" />
+                            <uni-easyinput v-model="item.unitPrice" type="digit" :inputBorder="false" placeholder="请输入销售价格" @input="onNonNegativeInput(idx, 'unitPrice')" @blur="onNonNegativeBlur(idx, 'unitPrice', 2)" />
                         </template>
                     </uni-list-item>
                     <uni-list-item title="不含税金额">
@@ -140,7 +156,7 @@
                     </uni-list-item>
                     <uni-list-item title="发货日期">
                         <template v-slot:footer>
-                            <uni-datetime-picker type="date" v-model="item.orderDate" @change="onDateChange(idx, $event)" />
+                            <uni-datetime-picker :start="minDeliveryDate" type="date" v-model="item.deliveryDate" @change="onDateChange(idx, $event)" />
                         </template>
                     </uni-list-item>
                 </uni-list>
@@ -161,10 +177,33 @@
                 <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.rawProductGrade }}</text></view>
                 <view class="row"><text class="label">原材料提供时间</text><text class="value">{{ item.rawProductProvideDate }}</text></view>
-                <view class="row"><text class="label">原材料到产品的转换比例</text><text class="value">{{ item.rawToProdRatioName }}</text></view>
+                <view class="row"><text class="label">原材料产品数量比</text><text class="value">{{ item.rawToProdRatioName }}</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.quality }}</text></view>
-                <view class="row"><text class="label">规格</text><text class="value">{{ item.specDisplay }}</text></view>
+          <!-- 厚（公差） * 宽（公差） * 长（公差） -->
+                    <view class="row row-spec"><text class="label">规格(mm)</text>
+                        <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 }}
+                                </view>
+                                <view v-if="item.thicknessTolNeg" class="value-spec_box_2">-{{ 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 }}</view>
+                                <view v-if="item.widthTolNeg" class="value-spec_box_2">-{{ 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 }}</view>
+                                <view v-if="item.lengthTolNeg" class="value-spec_box_2">-{{ item.lengthTolNeg }}</view>
+                            </view>
+                        </view>
+                    </view>
                 <view class="row"><text class="label">定做物数量</text><text class="value">{{ item.productQuantity }}</text></view>
                 <view class="row"><text class="label">加工费单价</text><text class="value">{{ formatCurrency(item.unitPrice)
                         }}</text>
@@ -174,7 +213,7 @@
                         }}</text></view>
                 <view class="row"><text class="label">总金额</text><text class="value">{{ formatCurrency(item.totalAmount)
                         }}</text></view>
-                <view class="row"><text class="label">发货日期</text><text class="value">{{ item.orderDate }}</text></view>
+                <view class="row"><text class="label">发货日期</text><text class="value">{{ item.deliveryDate }}</text></view>
             </view>
         </view>
             <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value" @confirm="onProductConfirm" />
@@ -188,8 +227,9 @@ export default {
         mode: { type: String, default: 'add' },
         list: { type: Array, default: () => [] },
         max: { type: Number, default: 8 },
-        orderDateBase: { type: String, default: '' },
+        deliveryDateBase: { type: String, default: '' },
         options: { type: Array, default: () => [] },
+        deliveryDate: { type: String, default: '' },
         rawToProdRatioList: { type: Array, default: () => [] }
     },
     components: { SingleSelectSheet },
@@ -207,14 +247,28 @@ export default {
         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.rawProductId)
       }))
-    }
-    ,
+    },
     ratioOptions() {
       const list = Array.isArray(this.rawToProdRatioList) ? this.rawToProdRatioList : []
       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.code)
       }))
+    },
+    minDeliveryDate() {
+      const s = this.deliveryDate
+      if (!s) return ''
+      const parts = String(s).split('-')
+      const y = Number(parts[0])
+      const m = Number(parts[1])
+      const d = Number(parts[2])
+      if (!y || !m || !d) return ''
+      const dt = new Date(y, m - 1, d)
+      dt.setDate(dt.getDate() + 1)
+      const yy = dt.getFullYear()
+      const mm = String(dt.getMonth() + 1).padStart(2, '0')
+      const dd = String(dt.getDate() - 1).padStart(2, '0')
+      return `${yy}/${mm}/${dd}`
     }
   },
   watch: {
@@ -239,7 +293,34 @@ export default {
   },
   methods: {
         defaultItem() {
-            return { rawProductId: '', rawProductName: '', rawProductGrade: '', industry: '',materialProductRatioRemarks:'', supplyTime: '存料加工', materialProductRatio: '', rawToProdRatioName: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '',  productQuantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, orderDate: '' }
+            return { productId:'', productName:'', productGrade:'', productStatus:'', rawProductId: '', rawProductName: '', rawProductGrade: '', industry: '',materialProductRatioRemarks:'', supplyTime: '存料加工', materialProductRatio: '', rawToProdRatioName: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '',  productQuantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '' }
+        },
+        onNonNegativeInput(idx, field) {
+            const it = this.items[idx]
+            if (!it) return
+            let v = String(it[field] != null ? it[field] : '')
+            v = v.replace(/[^0-9.]/g, '')
+            v = v.replace(/(\..*)\./g, '$1')
+            if (v.startsWith('.')) v = '0' + v
+            it[field] = v
+            this.$set(this.items, idx, it)
+            if (field === 'productQuantity' || field === 'unitPrice') this.$nextTick(() => this.recalculate(idx))
+        },
+        onNonNegativeBlur(idx, field, digits) {
+            const it = this.items[idx]
+            if (!it) return
+            const raw = it[field]
+            if (raw === '' || raw === null || raw === undefined) {
+                this.$set(this.items, idx, it)
+                if (field === 'productQuantity' || field === 'unitPrice') this.recalculate(idx)
+                return
+            }
+            let num = this.toNumber(raw)
+            if (isNaN(num) || num < 0) num = 0
+            const rounded = this.round(num, digits)
+            it[field] = rounded
+            this.$set(this.items, idx, it)
+            if (field === 'productQuantity' || field === 'unitPrice') this.recalculate(idx)
         },
         onImmediateChange(idx) {
             this.$nextTick(() => this.recalculate(idx))
@@ -290,6 +371,12 @@ export default {
             const match = opts.find(o => String(o.value) === String(current))
             this.sheet = { ...this.sheet, visible: true, title: '请选择原材料名称', options: opts, idx, value: match ? match.value : '', mode: 'product' }
         },
+        openProductTargetSheet(idx) {
+            const opts = this.selectOptions
+            const current = this.items[idx] && this.items[idx].productId
+            const match = opts.find(o => String(o.value) === String(current))
+            this.sheet = { ...this.sheet, visible: true, title: '请选择定作物名称', options: opts, idx, value: match ? match.value : '', mode: 'target' }
+        },
         openRawToProdRatioSheet(idx) {
             const opts = this.ratioOptions
             const current = this.items[idx] && this.items[idx].materialProductRatio
@@ -303,9 +390,12 @@ export default {
             if (this.sheet.mode === 'ratio') {
                 it.materialProductRatio = value
                 it.rawToProdRatioName = label || ''
-            } else {
+            } else if (this.sheet.mode === 'product') {
                 it.rawProductId = value
                 it.rawProductName = label || ''
+            } else if (this.sheet.mode === 'target') {
+                it.productId = value
+                it.productName = label || ''
             }
             this.$set(this.items, idx, it)
             this.sheet.visible = false
@@ -351,15 +441,15 @@ export default {
         onDateChange(idx, e) {
             const it = this.items[idx]
             if (!it) return
-            const val = typeof e === 'string' ? e : (e && e.detail && e.detail.value) ? e.detail.value : it.orderDate
+            const val = typeof e === 'string' ? e : (e && e.detail && e.detail.value) ? e.detail.value : it.deliveryDate
             const dateStr = String(val).slice(0, 10)
-            const base = this.orderDateBase ? new Date(this.orderDateBase) : null
+            const base = this.deliveryDateBase ? new Date(this.deliveryDateBase) : null
             const d = new Date(dateStr)
             if (base && !isNaN(d.getTime()) && d.getTime() < base.getTime()) {
                 uni.showToast({ title: '发货日期不得早于订货日期', icon: 'none' })
-                it.orderDate = this.orderDateBase
+                it.deliveryDate = this.deliveryDateBase
             } else {
-                it.orderDate = dateStr
+                it.deliveryDate = dateStr
             }
             this.$set(this.items, idx, it)
         },
@@ -532,8 +622,45 @@ export default {
 
 .value {
     flex: 1;
-    text-align: right;
     color: rgba(0, 0, 0, 0.9);
     font-size: 28rpx;
 }
+   .value-spec {
+        height: 48rpx;
+        display: flex;
+        align-items: center;
+        color: #000000;
+        // justify-content: end;
+        &_box {
+            position: relative;
+            width: 60rpx;
+            height: 48rpx;
+
+            &_1 {
+                font-size: 16rpx;
+                position: absolute;
+                top: -10rpx;
+                left: 0;
+            }
+
+            &_2 {
+                font-size: 16rpx;
+                position: absolute;
+                bottom: -10rpx;
+                left: 0;
+            }
+        }
+
+        &_val {
+            font-size: 28rpx;
+
+            &.p12 {
+                padding-right: 12rpx;
+            }
+        }
+    }
+        .row-spec {
+            height: 60rpx;
+            align-items: center;
+        }
 </style>

@@ -39,7 +39,7 @@
 						<view class="item-title"><text class="required">*</text><text>生产厂</text></view>
 					</template>
 				</uni-list-item>
-                <ProductRel mode="add" :orderDateBase="form.orderDate" @change="onProductsChange" :options="productList" />
+                <ProductRel mode="add" :deliveryDateBase="form.deliveryDate" :deliveryDate="form.orderDate" @change="onProductsChange" :options="productList" />
                 <uni-list-item title="合计人民币金额（大写）">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false" disabled />
@@ -92,33 +92,25 @@
                             :inputBorder="false" />
                     </template>
                 </uni-list-item>
-                <view class="group">
-                    <view class="group-title">特别条款要求</view>
-                    <view class="radio-list">
-                        <view v-for="(opt, i) in specialTermsList" :key="'cr-' + i" class="radio-item"
-                            @click="onRadioSelect('specialTerms', 'specialTermsName', opt)">
-                            <view :class="['radio', { checked: form.specialTerms === opt.value }]" />
-                            <text class="label">{{ opt.label }}</text>
-                        </view>
-                    </view>
-                </view>
-                <view class="group">
-                    <view class="group-title">执行标准</view>
-                    <view class="radio-list">
-                        <view v-for="(opt, i) in executionStandardList" :key="'es-' + i" class="radio-item"
-                            @click="onRadioSelect('executionStandard', 'executionStandardName', opt)">
-                            <view :class="['radio', { checked: form.executionStandard === opt.value }]" />
-                            <text class="label">{{ opt.label }}</text>
-                        </view>
-                    </view>
-                </view>
+                <uni-list-item class="select-item" :class="form.specialTermsName ? 'is-filled' : 'is-empty'" clickable
+                    @click="openSheet('specialTerms')" :rightText="form.specialTermsName || '请选择'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text class="required">*</text><text>特别条款要求</text></view>
+                    </template>
+                </uni-list-item>
+                <uni-list-item class="select-item" :class="form.executionStandardName ? 'is-filled' : 'is-empty'" clickable
+                    @click="openSheet('executionStandard')" :rightText="form.executionStandardName || '请选择'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text>执行标准</text></view>
+                    </template>
+                </uni-list-item>
                 <uni-list-item v-if="form.executionStandard === 'OTHER'" title="其他">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.executionStandardRemarks" placeholder="请输入其他标准备注"
                             :inputBorder="false" />
                     </template>
                 </uni-list-item>
-                <uni-list-item title="特别说明">
+                <uni-list-item title="特别说明" style="margin-top: 20rpx;">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.specialInstructions" placeholder="请输入特别说明" :inputBorder="false" />
                     </template>
@@ -181,7 +173,7 @@
                         数量
                     </div>
                     <div class="total-item-price">
-                        {{ (sumQuantity || 0).toFixed(2) }}t
+                        {{ (totalQuantity || 0).toFixed(2) }}kg
                     </div>
                 </div>
                 <div class="total-item">
@@ -189,7 +181,7 @@
                         不含税金额
                     </div>
                     <div class="total-item-price text-red">
-                        ￥{{ (sumAmountExcl || 0).toFixed(2) }}
+                        ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}
                     </div>
                 </div>
                 <div class="total-item">
@@ -197,7 +189,7 @@
                         总金额
                     </div>
                     <div class="total-item-price text-red">
-                        ￥{{ (sumTotal || 0).toFixed(2) }}
+                        ￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}
                     </div>
                 </div>
             </div>
@@ -233,6 +225,7 @@ export default {
                 buyer: '',
                 buyerName: '',
                 orderDate: '',
+                deliveryDate: '',
                 designatedConsignee: '',
                 specialTerms: '',
                 specialTermsName: '',
@@ -263,9 +256,9 @@ export default {
             yesNoList: [{ label: '是', value: true }, { label: '否', value: false }],
             sheet: { visible: false, title: '请选择', field: '', options: [], value: '' },
             relate: { visible: false, title: '选择', source: '', display: [], multiple: false, rowKey: 'id', selectedKeys: [], fieldKey: '' },
-            sumQuantity: 0,
-            sumAmountExcl: 0,
-            sumTotal: 0,
+            totalQuantity: 0,
+            totalAmountExcludingTax: 0,
+            totalAmountIncludingTax: 0,
             productLineList: [],
             productList: [],
             customerRemarks: [],
@@ -369,9 +362,9 @@ export default {
             const sumQ = list.reduce((acc, it) => acc + (parseFloat(it.quantity) || 0), 0)
             const sumE = list.reduce((acc, it) => acc + (parseFloat(it.amountExcludingTax) || 0), 0)
             const sumT = list.reduce((acc, it) => acc + (parseFloat(it.totalAmount) || 0), 0)
-            this.sumQuantity = sumQ
-            this.sumAmountExcl = sumE
-            this.sumTotal = sumT
+            this.totalQuantity = sumQ
+            this.totalAmountExcludingTax = sumE
+            this.totalAmountIncludingTax = sumT
             this.form.totalAmountCapital = formatCurrencyToChinese(sumT)
             this.productLineList = list
         },
@@ -447,6 +440,10 @@ export default {
                 setSheet('生产厂', opts)
             } else if (field === 'supplier') {
                 setSheet('供方', this.supplierList)
+            } else if (field === 'specialTerms') {
+                setSheet('特别条款要求', this.specialTermsList)
+            } else if (field === 'executionStandard') {
+                setSheet('执行标准', this.executionStandardList)
             } else if (field === 'includesPackagingFee') {
                 setSheet('单价中是否已包含包装费', this.yesNoList)
             } else if (field === 'includesTransportFee') {
@@ -517,9 +514,9 @@ export default {
                 ...formForSubmit,
                 destination,
                 type: 'DISTRIB_STD',
-                sumQuantity: this.sumQuantity,
-                sumAmountExcl: this.sumAmountExcl,
-                sumTotal: this.sumTotal,
+                totalQuantity: this.totalQuantity,
+                totalAmountExcludingTax: this.totalAmountExcludingTax,
+                totalAmountIncludingTax: this.totalAmountIncludingTax,
                 contractDistributorLineList: lines
             })
             console.log('onSubmit__payload', payload)
@@ -538,18 +535,31 @@ export default {
                 { key: 'supplier', label: '供方' },
                 { key: 'buyer', label: '需方' },
                 { key: 'orderDate', label: '订货日期' },
+                { key: 'unit', label: '单位' },
                 { key: 'workshopId', label: '生产厂' },
+                { key: 'specialTerms', label: '特别条款要求' },
             ]
             for (const it of checks) {
                 const val = this.form[it.key]
                 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
                 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
             }
-            if (!Array.isArray(this.productLineList) || this.productLineList.length === 0) {
+            const list = Array.isArray(this.productLineList) ? this.productLineList : []
+            if (list.length === 0) {
                 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false
             }
-            for (const [idx, it] of this.productLineList.entries()) {
-                if (!it.productName || !it.quantity || !it.unitPrice) {
+            const strEmpty = (v) => (v === undefined || v === null || (typeof v === 'string' && v.trim() === ''))
+            const numEmpty = (v) => (v === undefined || v === null || v === '' || (typeof v === 'number' && isNaN(v)))
+            for (const [idx, it] of list.entries()) {
+                if (
+                    strEmpty(it.productName) ||
+                    strEmpty(it.industry) ||
+                    strEmpty(it.quality) ||
+                    strEmpty(it.brand) ||
+                    numEmpty(it.quantity) ||
+                    numEmpty(it.unitPrice) ||
+                    strEmpty(it.deliveryDate)
+                ) {
                     uni.showToast({ title: `第${idx + 1}条明细未完整填写`, icon: 'none' }); return false
                 }
             }
@@ -577,7 +587,7 @@ export default {
             color: rgba(0, 0, 0, 0.6);
             line-height: 32rpx;
             width: 240rpx;
-            padding: 24rpx 0;
+            padding: 12rpx 0;
         }
         .total-item-price {
             font-weight: 600;
@@ -599,7 +609,7 @@ export default {
 
 .scroll {
   flex: 1;
-  padding: 12rpx 0 480rpx !important;
+  padding: 12rpx 0 392rpx !important;
 }
 
 .footer {

@@ -206,11 +206,11 @@ export default {
             const t = this.detail.standardApproved || ''
             const e = this.detail.standardShowExamine || false
             return [
-                { ...this.buttons[0], visible: (s === 'DRAFT') },
-                { ...this.buttons[1], visible: (s === 'DRAFT') },
-                { ...this.buttons[2], visible: (s !== 'DELETED' && t !== 'AUDIT' && t !== 'PASS') },
-                { ...this.buttons[3], visible: (s === 'STANDARD' && e && t === 'AUDIT') },
-                { ...this.buttons[4], visible: (s === 'STANDARD') }
+                { ...this.buttons[0], visible: (s === 'DRAFT' && this.$auth.hasPermi('contract-manage:distribution-standard-contract:modify')) },
+                { ...this.buttons[1], visible: (s === 'DRAFT' && this.$auth.hasPermi('contract-manage:distribution-standard-contract:delete')) },
+                { ...this.buttons[2], visible: (s !== 'DELETED' && t !== 'AUDIT' && t !== 'PASS' && this.$auth.hasPermi('contract-manage:distribution-standard-contract:upload')) },
+                { ...this.buttons[3], visible: (s === 'STANDARD' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-standard-contract:approve')) },
+                { ...this.buttons[4], visible: (s === 'STANDARD' && this.$auth.hasPermi('contract-manage:distribution-standard-contract:review')) }
             ]
         }
     },

@@ -14,7 +14,7 @@
           @input="onSearchInput"
         />
         <view class="tool-icons">
-          <image class="tool-icon" src="/static/images/dev_manage/add_icon.png" @click="onAdd" />
+          <image v-if="$auth.hasPermi('contract-manage:distribution-standard-contract:add')" class="tool-icon" src="/static/images/dev_manage/add_icon.png" @click="onAdd" />
           <image class="tool-icon" src="/static/images/dev_manage/filter_icon.png" @click="openFilter" />
         </view>
       </view>

@@ -41,7 +41,7 @@
                     </template>
                 </uni-list-item>
 
-                <ProductRel mode="add" :orderDateBase="form.orderDate" :list="productLineList" @change="onProductsChange" :options="productList" />
+                <ProductRel mode="add" :deliveryDateBase="form.deliveryDate"  :deliveryDate="form.orderDate" :list="productLineList" @change="onProductsChange" :options="productList" />
 
                 <uni-list-item title="合计人民币金额（大写）">
                     <template v-slot:footer>
@@ -99,33 +99,25 @@
                     </template>
                 </uni-list-item>
 
-                <view class="group">
-                    <view class="group-title">特别条款要求</view>
-                    <view class="radio-list">
-                        <view v-for="(opt, i) in specialTermsList" :key="'cr-' + i" class="radio-item"
-                            @click="onRadioSelect('specialTerms', 'specialTermsName', opt)">
-                            <view :class="['radio', { checked: form.specialTerms === opt.value }]" />
-                            <text class="label">{{ opt.label }}</text>
-                        </view>
-                    </view>
-                </view>
-                <view class="group">
-                    <view class="group-title">执行标准</view>
-                    <view class="radio-list">
-                        <view v-for="(opt, i) in executionStandardList" :key="'es-' + i" class="radio-item"
-                            @click="onRadioSelect('executionStandard', 'executionStandardName', opt)">
-                            <view :class="['radio', { checked: form.executionStandard === opt.value }]" />
-                            <text class="label">{{ opt.label }}</text>
-                        </view>
-                    </view>
-                </view>
+                <uni-list-item class="select-item" :class="form.specialTermsName ? 'is-filled' : 'is-empty'" clickable
+                    @click="openSheet('specialTerms')" :rightText="form.specialTermsName || '请选择'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text class="required">*</text><text>特别条款要求</text></view>
+                    </template>
+                </uni-list-item>
+                <uni-list-item class="select-item" :class="form.executionStandardName ? 'is-filled' : 'is-empty'" clickable
+                    @click="openSheet('executionStandard')" :rightText="form.executionStandardName || '请选择'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text>执行标准</text></view>
+                    </template>
+                </uni-list-item>
                 <uni-list-item v-if="form.executionStandard === 'OTHER'" title="其他">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.executionStandardRemarks" placeholder="请输入其他标准备注"
                             :inputBorder="false" />
                     </template>
                 </uni-list-item>
-                <uni-list-item title="特别说明">
+                <uni-list-item title="特别说明" style="margin-top: 20rpx;">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.specialInstructions" placeholder="请输入特别说明" :inputBorder="false" />
                     </template>
@@ -177,15 +169,15 @@
                 <div class="total-text">合计</div>
                 <div class="total-item">
                     <div class="total-item-text">数量</div>
-                    <div class="total-item-price">{{ (sumQuantity || 0).toFixed(2) }}t</div>
+                    <div class="total-item-price">{{ (totalQuantity || 0).toFixed(2) }}kg</div>
                 </div>
                 <div class="total-item">
                     <div class="total-item-text">不含税金额</div>
-                    <div class="total-item-price text-red">￥{{ (sumAmountExcl || 0).toFixed(2) }}</div>
+                    <div class="total-item-price text-red">￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}</div>
                 </div>
                 <div class="total-item">
                     <div class="total-item-text">总金额</div>
-                    <div class="total-item-price text-red">￥{{ (sumTotal || 0).toFixed(2) }}</div>
+                    <div class="total-item-price text-red">￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}</div>
                 </div>
             </div>
             <button class="btn submit" type="primary" @click="onSubmit">保存</button>
@@ -223,6 +215,7 @@ export default {
                 workshopId: '',
                 workshopName: '',
                 orderDate: '',
+                deliveryDate: '',
                 designatedConsignee: '',
                 specialTerms: '',
                 specialTermsName: '',
@@ -256,9 +249,9 @@ export default {
             yesNoList: [{ label: '是', value: true }, { label: '否', value: false }],
             sheet: { visible: false, title: '请选择', field: '', options: [], value: '' },
             relate: { visible: false, title: '选择', source: '', display: [], multiple: false, rowKey: 'id', selectedKeys: [], fieldKey: '' },
-            sumQuantity: 0,
-            sumAmountExcl: 0,
-            sumTotal: 0,
+            totalQuantity: 0,
+            totalAmountExcludingTax: 0,
+            totalAmountIncludingTax: 0,
             productLineList: [],
             newProductLineList: [],
             productList: []
@@ -349,9 +342,9 @@ export default {
             const sumQ = list.reduce((acc, it) => acc + (parseFloat(it.quantity) || 0), 0)
             const sumE = list.reduce((acc, it) => acc + (parseFloat(it.amountExcludingTax) || 0), 0)
             const sumT = list.reduce((acc, it) => acc + (parseFloat(it.totalAmount) || 0), 0)
-            this.sumQuantity = sumQ
-            this.sumAmountExcl = sumE
-            this.sumTotal = sumT
+            this.totalQuantity = sumQ
+            this.totalAmountExcludingTax = sumE
+            this.totalAmountIncludingTax = sumT
             this.form.totalAmountCapital = formatCurrencyToChinese(sumT)
         },
         async loadSuppliers() {
@@ -399,6 +392,10 @@ export default {
                 setSheet('生产厂', opts)
             } else if (field === 'supplier') {
                 setSheet('供方', this.supplierList)
+            } else if (field === 'specialTerms') {
+                setSheet('特别条款要求', this.specialTermsList)
+            } else if (field === 'executionStandard') {
+                setSheet('执行标准', this.executionStandardList)
             } else if (field === 'includesPackagingFee') {
                 setSheet('单价中是否已包含包装费', this.yesNoList)
             } else if (field === 'includesTransportFee') {
@@ -443,18 +440,32 @@ export default {
                 { key: 'supplier', label: '供方' },
                 { key: 'buyer', label: '需方' },
                 { key: 'orderDate', label: '订货日期' },
+                { key: 'unit', label: '单位' },
                 { key: 'workshopId', label: '生产厂' },
+                { key: 'specialTerms', label: '特别条款要求' },
             ]
             for (const it of checks) {
                 const val = this.form[it.key]
                 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
                 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
             }
-            if (!Array.isArray(this.productLineList) || this.productLineList.length === 0) {
+            const list = Array.isArray(this.newProductLineList) ? this.newProductLineList : []
+            if (list.length === 0) {
                 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false
             }
-            for (const [idx, it] of this.productLineList.entries()) {
-                if (!it.productName || !it.quantity || !it.unitPrice) {
+            const strEmpty = (v) => (v === undefined || v === null || (typeof v === 'string' && v.trim() === ''))
+            const numEmpty = (v) => (v === undefined || v === null || v === '' || (typeof v === 'number' && isNaN(v)))
+            for (const [idx, it] of list.entries()) {
+                console.log('it111', it)
+                if (
+                    strEmpty(it.productName) ||
+                    strEmpty(it.industry) ||
+                    strEmpty(it.quality) ||
+                    strEmpty(it.brand) ||
+                    numEmpty(it.quantity) ||
+                    numEmpty(it.unitPrice) ||
+                    strEmpty(it.deliveryDate)
+                ) {
                     uni.showToast({ title: `第${idx + 1}条明细未完整填写`, icon: 'none' }); return false
                 }
             }
@@ -486,9 +497,9 @@ export default {
                 id: this.form.id,
                 destination,
                 type: 'DISTRIB_STD',
-                sumQuantity: this.sumQuantity,
-                sumAmountExcl: this.sumAmountExcl,
-                sumTotal: this.sumTotal,
+                totalQuantity: this.totalQuantity,
+                totalAmountExcludingTax: this.totalAmountExcludingTax,
+                totalAmountIncludingTax: this.totalAmountIncludingTax,
                 contractDistributorLineList: lines
             })
             try {
@@ -524,7 +535,7 @@ export default {
         color: rgba(0, 0, 0, 0.6);
         line-height: 32rpx;
         width: 240rpx;
-        padding: 24rpx 0;
+        padding: 12rpx 0;
     }
 
     .total-item-price {
@@ -547,7 +558,7 @@ export default {
 
 .scroll {
     flex: 1;
-    padding: 12rpx 0 480rpx !important;
+    padding: 12rpx 0 392rpx !important;
 }
 
 .footer {
@@ -742,4 +753,4 @@ export default {
                 }
             }
                
-</style>
\ No newline at end of file
+</style>

@@ -53,53 +53,53 @@
                             <uni-easyinput v-model="item.quality" :inputBorder="false" placeholder="请输入品质" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="厚度">
+                    <uni-list-item title="厚度(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.thickness" :inputBorder="false" placeholder="请输入厚度" />
+                            <uni-easyinput type="digit" v-model="item.thickness" :inputBorder="false" placeholder="请输入厚度" @input="onNonNegativeInput(idx, 'thickness')" @blur="onNonNegativeBlur(idx, 'thickness', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="厚度公差(单项+)">
+                    <uni-list-item title="厚度公差上限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.thicknessTolPos" :inputBorder="false"
-                                placeholder="请输入厚度公差(单项+)" />
+                            <uni-easyinput type="digit" v-model="item.thicknessTolPos" :inputBorder="false"
+                                placeholder="请输入厚度公差上限" @input="onNonNegativeInput(idx, 'thicknessTolPos')" @blur="onNonNegativeBlur(idx, 'thicknessTolPos', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="厚度公差(单项-)">
+                    <uni-list-item title="厚度公差下限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.thicknessTolNeg" :inputBorder="false"
-                                placeholder="请输入厚度公差(单项-)" />
+                            <uni-easyinput type="digit" v-model="item.thicknessTolNeg" :inputBorder="false"
+                                placeholder="请输入厚度公差下限" @input="onNonNegativeInput(idx, 'thicknessTolNeg')" @blur="onNonNegativeBlur(idx, 'thicknessTolNeg', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="宽度">
+                    <uni-list-item title="宽度(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.width" :inputBorder="false" placeholder="请输入宽度" />
+                            <uni-easyinput type="digit" v-model="item.width" :inputBorder="false" placeholder="请输入宽度" @input="onNonNegativeInput(idx, 'width')" @blur="onNonNegativeBlur(idx, 'width', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="宽度公差(单项+)">
+                    <uni-list-item title="宽度公差上限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差(单项+)" />
+                            <uni-easyinput type="digit" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差上限" @input="onNonNegativeInput(idx, 'widthTolPos')" @blur="onNonNegativeBlur(idx, 'widthTolPos', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="宽度公差(单项-)">
+                    <uni-list-item title="宽度公差下限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差(单项-)" />
+                            <uni-easyinput type="digit" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差下限" @input="onNonNegativeInput(idx, 'widthTolNeg')" @blur="onNonNegativeBlur(idx, 'widthTolNeg', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="长度">
+                    <uni-list-item title="长度(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.length" :inputBorder="false" placeholder="请输入长度" />
+                            <uni-easyinput type="digit" v-model="item.length" :inputBorder="false" placeholder="请输入长度" @input="onNonNegativeInput(idx, 'length')" @blur="onNonNegativeBlur(idx, 'length', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="长度公差(单项+)">
+                    <uni-list-item title="长度公差上限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.lengthTolPos" :inputBorder="false"
-                                placeholder="请输入长度公差(单项+)" />
+                            <uni-easyinput type="digit" v-model="item.lengthTolPos" :inputBorder="false"
+                                placeholder="请输入长度公差上限" @input="onNonNegativeInput(idx, 'lengthTolPos')" @blur="onNonNegativeBlur(idx, 'lengthTolPos', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="长度公差(单项-)">
+                    <uni-list-item title="长度公差下限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.lengthTolNeg" :inputBorder="false"
-                                placeholder="请输入长度公差(单项-)" />
+                            <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false"
+                                placeholder="请输入长度公差下限" @input="onNonNegativeInput(idx, 'lengthTolNeg')" @blur="onNonNegativeBlur(idx, 'lengthTolNeg', 2)" />
                         </template>
                     </uni-list-item>
                     <uni-list-item title="状态">
@@ -107,14 +107,14 @@
                             <uni-easyinput v-model="item.status" :inputBorder="false" placeholder="请输入状态" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="数量">
+                    <uni-list-item title="数量kg">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.quantity" type="number" :inputBorder="false" placeholder="请输入数量" @input="onImmediateChange(idx)" @blur="onNumberBlur(idx, 'quantity', 0)" />
+                            <uni-easyinput v-model="item.quantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'quantity')" @blur="onNonNegativeBlur(idx, 'quantity', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="单价">
+                    <uni-list-item title="销售价格">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.unitPrice" type="number" :inputBorder="false" placeholder="请输入单价" @input="onImmediateChange(idx)" @blur="onNumberBlur(idx, 'unitPrice', 0)" />
+                            <uni-easyinput v-model="item.unitPrice" type="digit" :inputBorder="false" placeholder="请输入销售价格" @input="onNonNegativeInput(idx, 'unitPrice')" @blur="onNonNegativeBlur(idx, 'unitPrice', 2)" />
                         </template>
                     </uni-list-item>
                     <uni-list-item title="不含税金额">
@@ -129,7 +129,7 @@
                     </uni-list-item>
                     <uni-list-item title="发货日期">
                         <template v-slot:footer>
-                            <uni-datetime-picker type="date" v-model="item.orderDate" @change="onDateChange(idx, $event)" />
+                            <uni-datetime-picker :start="minDeliveryDate" type="date" v-model="item.deliveryDate" @change="onDateChange(idx, $event)" />
                         </template>
                     </uni-list-item>
                 </uni-list>
@@ -151,7 +151,30 @@
                 <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>
                 <view class="row"><text class="label">品质</text><text class="value">{{ item.quality }}</text></view>
-                <view class="row"><text class="label">规格</text><text class="value">{{ item.specDisplay }}</text></view>
+                    <!-- 厚（公差） * 宽（公差） * 长（公差） -->
+                    <view class="row row-spec"><text class="label">规格(mm)</text>
+                        <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 }}
+                                </view>
+                                <view v-if="item.thicknessTolNeg" class="value-spec_box_2">-{{ 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 }}</view>
+                                <view v-if="item.widthTolNeg" class="value-spec_box_2">-{{ 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 }}</view>
+                                <view v-if="item.lengthTolNeg" class="value-spec_box_2">-{{ item.lengthTolNeg }}</view>
+                            </view>
+                        </view>
+                    </view>
                 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view>
                 <view class="row"><text class="label">数量</text><text class="value">{{ item.quantity }}</text></view>
                 <view class="row"><text class="label">单价</text><text class="value">{{ formatCurrency(item.unitPrice)
@@ -162,7 +185,7 @@
                         }}</text></view>
                 <view class="row"><text class="label">总金额</text><text class="value">{{ formatCurrency(item.totalAmount)
                         }}</text></view>
-                <view class="row"><text class="label">发货日期</text><text class="value">{{ item.orderDate }}</text></view>
+                <view class="row"><text class="label">发货日期</text><text class="value">{{ item.deliveryDate }}</text></view>
             </view>
         </view>
             <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value" @confirm="onProductConfirm" />
@@ -176,7 +199,8 @@ export default {
         mode: { type: String, default: 'add' },
         list: { type: Array, default: () => [] },
         max: { type: Number, default: 8 },
-        orderDateBase: { type: String, default: '' },
+        deliveryDateBase: { type: String, default: '' },
+        deliveryDate: { type: String, default: '' },
         options: { type: Array, default: () => [] }
     },
     components: { SingleSelectSheet },
@@ -194,6 +218,21 @@ export default {
         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)
       }))
+    },
+    minDeliveryDate() {
+      const s = this.deliveryDate
+      if (!s) return ''
+      const parts = String(s).split('-')
+      const y = Number(parts[0])
+      const m = Number(parts[1])
+      const d = Number(parts[2])
+      if (!y || !m || !d) return ''
+      const dt = new Date(y, m - 1, d)
+      dt.setDate(dt.getDate() + 1)
+      const yy = dt.getFullYear()
+      const mm = String(dt.getMonth() + 1).padStart(2, '0')
+      const dd = String(dt.getDate() - 1).padStart(2, '0')
+      return `${yy}/${mm}/${dd}`
     }
   },
   watch: {
@@ -218,10 +257,18 @@ export default {
   },
   methods: {
         defaultItem() {
-            return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, orderDate: '' }
+            return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '' }
         },
-        onImmediateChange(idx) {
-            this.$nextTick(() => this.recalculate(idx))
+        onNonNegativeInput(idx, field) {
+            const it = this.items[idx]
+            if (!it) return
+            let v = String(it[field] != null ? it[field] : '')
+            v = v.replace(/[^0-9.]/g, '')
+            v = v.replace(/(\..*)\./g, '$1')
+            if (v.startsWith('.')) v = '0' + v
+            it[field] = v
+            this.$set(this.items, idx, it)
+            if (field === 'quantity' || field === 'unitPrice') this.$nextTick(() => this.recalculate(idx))
         },
         toNumber(val) {
             if (typeof val === 'number') return isNaN(val) ? 0 : val
@@ -234,21 +281,21 @@ export default {
             const m = Math.pow(10, digits)
             return Math.round(n * m) / m
         },
-        onNumberBlur(idx, field, digits) {
+        onNonNegativeBlur(idx, field, digits) {
             const it = this.items[idx]
             if (!it) return
             const raw = it[field]
-            // 如果为空则保持为空，不自动置为0，仅重新计算依赖字段
             if (raw === '' || raw === null || raw === undefined) {
                 this.$set(this.items, idx, it)
-                this.recalculate(idx)
+                if (field === 'quantity' || field === 'unitPrice') this.recalculate(idx)
                 return
             }
-            const num = this.toNumber(raw)
+            let num = this.toNumber(raw)
+            if (isNaN(num) || num < 0) num = 0
             const rounded = this.round(num, digits)
             it[field] = rounded
             this.$set(this.items, idx, it)
-            this.recalculate(idx)
+            if (field === 'quantity' || field === 'unitPrice') this.recalculate(idx)
         },
         formatCurrency(val) {
             if (val == null || val === '') return ''
@@ -319,15 +366,15 @@ export default {
         onDateChange(idx, e) {
             const it = this.items[idx]
             if (!it) return
-            const val = typeof e === 'string' ? e : (e && e.detail && e.detail.value) ? e.detail.value : it.orderDate
+            const val = typeof e === 'string' ? e : (e && e.detail && e.detail.value) ? e.detail.value : it.deliveryDate
             const dateStr = String(val).slice(0, 10)
-            const base = this.orderDateBase ? new Date(this.orderDateBase) : null
+            const base = this.deliveryDateBase ? new Date(this.deliveryDateBase) : null
             const d = new Date(dateStr)
             if (base && !isNaN(d.getTime()) && d.getTime() < base.getTime()) {
                 uni.showToast({ title: '发货日期不得早于订货日期', icon: 'none' })
-                it.orderDate = this.orderDateBase
+                it.deliveryDate = this.deliveryDateBase
             } else {
-                it.orderDate = dateStr
+                it.deliveryDate = dateStr
             }
             this.$set(this.items, idx, it)
         },
@@ -500,8 +547,46 @@ export default {
 
 .value {
     flex: 1;
-    text-align: right;
+    // text-align: right;
     color: rgba(0, 0, 0, 0.9);
     font-size: 28rpx;
 }
+    .value-spec {
+        height: 48rpx;
+        display: flex;
+        align-items: center;
+        color: #000000;
+        // justify-content: end;
+        &_box {
+            position: relative;
+            width: 60rpx;
+            height: 48rpx;
+
+            &_1 {
+                font-size: 16rpx;
+                position: absolute;
+                top: -10rpx;
+                left: 0;
+            }
+
+            &_2 {
+                font-size: 16rpx;
+                position: absolute;
+                bottom: -10rpx;
+                left: 0;
+            }
+        }
+
+        &_val {
+            font-size: 28rpx;
+
+            &.p12 {
+                padding-right: 12rpx;
+            }
+        }
+    }
+        .row-spec {
+            height: 60rpx;
+            align-items: center;
+        }
 </style>

@@ -39,7 +39,7 @@
 						<view class="item-title"><text class="required">*</text><text>生产厂</text></view>
 					</template>
 				</uni-list-item>
-                <ProductRel mode="add" :orderDateBase="form.orderDate" @change="onProductsChange" :options="productList" />
+                <ProductRel mode="add"  :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" @change="onProductsChange" :options="productList" />
                 <uni-list-item title="合计人民币金额（大写）">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false" disabled />
@@ -92,33 +92,25 @@
                             :inputBorder="false" />
                     </template>
                 </uni-list-item>
-                <view class="group">
-                    <view class="group-title">特别条款要求</view>
-                    <view class="radio-list">
-                        <view v-for="(opt, i) in specialTermsList" :key="'cr-' + i" class="radio-item"
-                            @click="onRadioSelect('specialTerms', 'specialTermsName', opt)">
-                            <view :class="['radio', { checked: form.specialTerms === opt.value }]" />
-                            <text class="label">{{ opt.label }}</text>
-                        </view>
-                    </view>
-                </view>
-                <view class="group">
-                    <view class="group-title">执行标准</view>
-                    <view class="radio-list">
-                        <view v-for="(opt, i) in executionStandardList" :key="'es-' + i" class="radio-item"
-                            @click="onRadioSelect('executionStandard', 'executionStandardName', opt)">
-                            <view :class="['radio', { checked: form.executionStandard === opt.value }]" />
-                            <text class="label">{{ opt.label }}</text>
-                        </view>
-                    </view>
-                </view>
+                <uni-list-item class="select-item" :class="form.specialTermsName ? 'is-filled' : 'is-empty'" clickable
+                    @click="openSheet('specialTerms')" :rightText="form.specialTermsName || '请选择'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text class="required">*</text><text>特别条款要求</text></view>
+                    </template>
+                </uni-list-item>
+                <uni-list-item class="select-item" :class="form.executionStandardName ? 'is-filled' : 'is-empty'" clickable
+                    @click="openSheet('executionStandard')" :rightText="form.executionStandardName || '请选择'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text>执行标准</text></view>
+                    </template>
+                </uni-list-item>
                 <uni-list-item v-if="form.executionStandard === 'OTHER'" title="其他">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.executionStandardRemarks" placeholder="请输入其他标准备注"
                             :inputBorder="false" />
                     </template>
                 </uni-list-item>
-                <uni-list-item title="特别说明">
+                <uni-list-item title="特别说明"  style="margin-top: 20rpx;">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.specialInstructions" placeholder="请输入特别说明" :inputBorder="false" />
                     </template>
@@ -181,7 +173,7 @@
                         数量
                     </div>
                     <div class="total-item-price">
-                        {{ (sumQuantity || 0).toFixed(2) }}t
+                        {{ (totalQuantity || 0).toFixed(2) }}kg
                     </div>
                 </div>
                 <div class="total-item">
@@ -189,7 +181,7 @@
                         不含税金额
                     </div>
                     <div class="total-item-price text-red">
-                        ￥{{ (sumAmountExcl || 0).toFixed(2) }}
+                        ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}
                     </div>
                 </div>
                 <div class="total-item">
@@ -197,7 +189,7 @@
                         总金额
                     </div>
                     <div class="total-item-price text-red">
-                        ￥{{ (sumTotal || 0).toFixed(2) }}
+                        ￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}
                     </div>
                 </div>
             </div>
@@ -233,6 +225,7 @@ export default {
                 buyer: '',
                 buyerName: '',
                 orderDate: '',
+                deliveryDate: '',
                 designatedConsignee: '',
                 specialTerms: '',
                 specialTermsName: '',
@@ -263,9 +256,9 @@ export default {
             yesNoList: [{ label: '是', value: true }, { label: '否', value: false }],
             sheet: { visible: false, title: '请选择', field: '', options: [], value: '' },
             relate: { visible: false, title: '选择', source: '', display: [], multiple: false, rowKey: 'id', selectedKeys: [], fieldKey: '' },
-            sumQuantity: 0,
-            sumAmountExcl: 0,
-            sumTotal: 0,
+            totalQuantity: 0,
+            totalAmountExcludingTax: 0,
+            totalAmountIncludingTax: 0,
             productLineList: [],
             productList: [],
             customerRemarks: [],
@@ -368,9 +361,9 @@ export default {
             const sumQ = list.reduce((acc, it) => acc + (parseFloat(it.quantity) || 0), 0)
             const sumE = list.reduce((acc, it) => acc + (parseFloat(it.amountExcludingTax) || 0), 0)
             const sumT = list.reduce((acc, it) => acc + (parseFloat(it.totalAmount) || 0), 0)
-            this.sumQuantity = sumQ
-            this.sumAmountExcl = sumE
-            this.sumTotal = sumT
+            this.totalQuantity = sumQ
+            this.totalAmountExcludingTax = sumE
+            this.totalAmountIncludingTax = sumT
             this.form.totalAmountCapital = formatCurrencyToChinese(sumT)
             this.productLineList = list
         },
@@ -446,6 +439,10 @@ export default {
                 setSheet('生产厂', opts)
             } else if (field === 'supplier') {
                 setSheet('供方', this.supplierList)
+            } else if (field === 'specialTerms') {
+                setSheet('特别条款要求', this.specialTermsList)
+            } else if (field === 'executionStandard') {
+                setSheet('执行标准', this.executionStandardList)
             } else if (field === 'includesPackagingFee') {
                 setSheet('单价中是否已包含包装费', this.yesNoList)
             } else if (field === 'includesTransportFee') {
@@ -516,9 +513,9 @@ export default {
                 ...formForSubmit,
                 destination,
                 type: 'DIST_STOCK_CONTRACT',
-                sumQuantity: this.sumQuantity,
-                sumAmountExcl: this.sumAmountExcl,
-                sumTotal: this.sumTotal,
+                totalQuantity: this.totalQuantity,
+                totalAmountExcludingTax: this.totalAmountExcludingTax,
+                totalAmountIncludingTax: this.totalAmountIncludingTax,
                 contractDistributorLineList: lines
             })
             console.log('onSubmit__payload', payload)
@@ -537,18 +534,30 @@ export default {
                 { key: 'supplier', label: '供方' },
                 { key: 'buyer', label: '需方' },
                 { key: 'orderDate', label: '订货日期' },
+                { key: 'unit', label: '单位' },
                 { key: 'workshopId', label: '生产厂' },
+                { key: 'specialTerms', label: '特别条款要求' },
             ]
             for (const it of checks) {
                 const val = this.form[it.key]
                 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
                 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
             }
-            if (!Array.isArray(this.productLineList) || this.productLineList.length === 0) {
+            const list = Array.isArray(this.productLineList) ? this.productLineList : []
+            if (list.length === 0) {
                 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false
             }
-            for (const [idx, it] of this.productLineList.entries()) {
-                if (!it.productName || !it.quantity || !it.unitPrice) {
+            const strEmpty = (v) => (v === undefined || v === null || (typeof v === 'string' && v.trim() === ''))
+            const numEmpty = (v) => (v === undefined || v === null || v === '' || (typeof v === 'number' && isNaN(v)))
+            for (const [idx, it] of list.entries()) {
+                if (
+                    strEmpty(it.productName) ||
+                    strEmpty(it.industry) ||
+                    strEmpty(it.quality) ||
+                    strEmpty(it.brand) ||
+                    numEmpty(it.quantity) ||
+                    strEmpty(it.deliveryDate)
+                ) {
                     uni.showToast({ title: `第${idx + 1}条明细未完整填写`, icon: 'none' }); return false
                 }
             }
@@ -576,7 +585,7 @@ export default {
             color: rgba(0, 0, 0, 0.6);
             line-height: 32rpx;
             width: 240rpx;
-            padding: 24rpx 0;
+            padding: 12rpx 0;
         }
         .total-item-price {
             font-weight: 600;
@@ -598,7 +607,7 @@ export default {
 
 .scroll {
   flex: 1;
-  padding: 12rpx 0 480rpx !important;
+  padding: 12rpx 0 392rpx !important;
 }
 
 .footer {

@@ -52,13 +52,13 @@
                             }}</text></view>
                 </view>
 
-                <view class="section">
+                <view class="section" v-if="detail.status === 'STANDARD'">
                     <view class="row"><text class="label">规范性合同</text><text class="value" style="color: #3D48A3;">{{ detail.standardFileName || '-'
                             }}</text></view>
                     <view class="row"><text class="label">合同是否规范</text><text class="value">{{ detail.standardStandardized ? '是' : '否' 
                             }}</text></view>
                 </view>
-                <view class="section" v-if="status === 'FORMAL'">
+                <view class="section" v-if="detail.status === 'FORMAL'">
                     <view class="row"><text class="label">规范性合同</text><text class="value" style="color: #3D48A3;">{{ detail.formalFileName || '-' }}</text></view>
                     <view class="row"><text class="label">合同是否规范</text><text class="value">{{ detail.formalStandardized ? '是' : '否' }}</text></view>
                 </view>
@@ -252,18 +252,18 @@ export default {
         const e = this.detail.showExamine || false
         const f = this.detail.standardShowExamine || false
         return [
-          { ...this.buttons[0], visible: (s === 'DRAFT') },
-          { ...this.buttons[1], visible: (s === 'DRAFT')  },
-          { ...this.buttons[2], visible: (s === 'FORMAL' && !l)  },
-          { ...this.buttons[3], visible: ((s === 'DRAFT' || s === 'FORMAL') && t !== 'AUDIT' && t !== 'PASS') },
-          { ...this.buttons[4], visible: (s === 'STANDARD' && t !== 'AUDIT' && t !== 'PASS') },
-          { ...this.buttons[5], visible: (s === 'STANDARD' && a !== 'AUDIT' && a !== 'PASS') },
-          { ...this.buttons[6], visible: (s === 'FORMAL' && e && t === 'AUDIT') },
-          { ...this.buttons[7], visible: (s === 'STANDARD' && e && t === 'AUDIT') },
-          { ...this.buttons[8], visible: (s === 'STANDARD' && f && a === 'AUDIT') },
-          { ...this.buttons[9], visible: (s === 'FORMAL' && t) },
-          { ...this.buttons[10], visible: (s === 'STANDARD' && t ) },
-          { ...this.buttons[11], visible: (s === 'STANDARD' && a ) },
+          { ...this.buttons[0], visible: (s === 'DRAFT' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:modify')) },
+          { ...this.buttons[1], visible: (s === 'DRAFT' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:delete'))  },
+          { ...this.buttons[2], visible: (s === 'FORMAL' && !l && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:lock'))  },
+          { ...this.buttons[3], visible: ((s === 'DRAFT' || s === 'FORMAL') && t !== 'AUDIT' && t !== 'PASS' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:upload')) },
+          { ...this.buttons[4], visible: (s === 'STANDARD' && t !== 'AUDIT' && t !== 'PASS' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:upload')) },
+          { ...this.buttons[5], visible: (s === 'STANDARD' && a !== 'AUDIT' && a !== 'PASS' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:standard-upload')) },
+          { ...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[8], visible: (s === 'STANDARD' && f && a === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:restandard-approveview')) },
+          { ...this.buttons[9], visible: (s === 'FORMAL' && t && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:review')) },
+          { ...this.buttons[10], visible: (s === 'STANDARD' && t && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:review')) },
+          { ...this.buttons[11], visible: (s === 'STANDARD' && a && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:standard-review')) },
         ]
       }
     },

@@ -14,7 +14,7 @@
           @input="onSearchInput"
         />
         <view class="tool-icons">
-          <image class="tool-icon" src="/static/images/dev_manage/add_icon.png" @click="onAdd" />
+          <image v-if="$auth.hasPermi('contract-manage:distribution-inventory-contract:add')" class="tool-icon" src="/static/images/dev_manage/add_icon.png" @click="onAdd" />
           <image class="tool-icon" src="/static/images/dev_manage/filter_icon.png" @click="openFilter" />
         </view>
       </view>
@@ -61,7 +61,9 @@
               <text>订单总额</text><text class="amount" :style="{ color: '#b67a76' }">¥{{ formatAmount(item.totalAmountIncludingTax) }}</text>
             </view>
             <view class="info-row" v-if="item.status === 'STANDARD' || item.status === 'FORMAL'">
-              <text>{{ item.status === 'STANDARD' ? '标准合同' : '正式合同' }}规范性审核状态</text><span class="info-status" :style="getStatusCss(item.standardApprovedName)">{{ item.standardApprovedName }}</span>
+              <text>{{ item.status === 'STANDARD' ? '标准合同' : '正式合同' }}规范性审核状态</text>
+              <span v-if="item.status === 'STANDARD' ? item.standardApprovedName : item.formalApprovedName" class="info-status" :style="getStatusCss(item.status === 'STANDARD' ? item.standardApprovedName : item.formalApprovedName)">{{ item.status === 'STANDARD' ? item.standardApprovedName : item.formalApprovedName }}</span>
+              <span v-else>-</span>
             </view>
             <view class="info-row">
               <text>订货日期</text><text>{{ item.orderDate }}</text>
@@ -244,7 +246,7 @@ export default {
       const list = Array.isArray(this.statusStyle) ? this.statusStyle : []
       const found = list.find(it => it && it.text === name) || {}
       return {
-        color: found.color || '#000',
+        color: found.color || '#fff',
         backgroundColor: found.bgColor || '#000'
       }
     }

@@ -108,7 +108,7 @@
                         数量
                     </div>
                     <div class="total-item-price">
-                        {{ (sumQuantity || 0).toFixed(2) }}t
+                        {{ (totalQuantity || 0).toFixed(2) }}t
                     </div>
                 </div>
                 <div class="total-item">
@@ -116,7 +116,7 @@
                         不含税金额
                     </div>
                     <div class="total-item-price text-red">
-                        ￥{{ (sumAmountExcl || 0).toFixed(2) }}
+                        ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}
                     </div>
                 </div>
                 <div class="total-item">
@@ -124,7 +124,7 @@
                         总金额
                     </div>
                     <div class="total-item-price text-red">
-                        ￥{{ (sumTotal || 0).toFixed(2) }}
+                        ￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}
                     </div>
                 </div>
             </div>
@@ -147,15 +147,15 @@ export default {
         }
     },
   computed: {
-        sumQuantity() {
+        totalQuantity() {
             const qty = this.items.filter(it => it.locked).reduce((p, c) => p + this.toNumber(c.quantity), 0)
             return this.round(qty, 2)
         },
-        sumAmountExcl() {
+        totalAmountExcludingTax() {
             const sum = this.items.filter(it => it.locked).reduce((p, c) => p + this.toNumber(c.amountExcludingTax), 0)
             return this.round(sum, 2)
         },
-        sumTotal() { return this.totalAmount },
+        totalAmountIncludingTax() { return this.totalAmount },
         totalAmount() {
             let sum = 0
             for (const it of this.items) {
@@ -325,9 +325,9 @@ export default {
             const payload = {
                 id: this.id,
                 totalAmountCapital: formatCurrencyToChinese(this.sumTotal),
-                totalAmountExcludingTax: this.sumAmountExcl,
-                totalAmountIncludingTax: this.sumTotal,
-                totalQuantity: this.sumQuantity,
+                totalAmountExcludingTax: this.totalAmountExcludingTax,
+                totalAmountIncludingTax: this.totalAmountIncludingTax,
+                totalQuantity: this.totalQuantity,
                 type:'DIST_STOCK_CONTRACT',
                 contractDistributorLineList: selected
             }
@@ -362,7 +362,7 @@ export default {
 
 .scroll {
     flex: 1;
-    padding: 12rpx 0 480rpx !important;
+    padding: 12rpx 0 392rpx !important;
 }
 
 .header {
@@ -646,7 +646,7 @@ export default {
             color: rgba(0, 0, 0, 0.6);
             line-height: 32rpx;
             width: 240rpx;
-            padding: 24rpx 0;
+            padding: 12rpx 0;
         }
 
         .total-item-price {

@@ -41,7 +41,7 @@
                     </template>
                 </uni-list-item>
 
-                <ProductRel mode="add" :orderDateBase="form.orderDate" :list="productLineList" @change="onProductsChange" :options="productList" />
+                <ProductRel mode="add"  :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" :list="productLineList" @change="onProductsChange" :options="productList" />
 
                 <uni-list-item title="合计人民币金额（大写）">
                     <template v-slot:footer>
@@ -99,33 +99,25 @@
                     </template>
                 </uni-list-item>
 
-                <view class="group">
-                    <view class="group-title">特别条款要求</view>
-                    <view class="radio-list">
-                        <view v-for="(opt, i) in specialTermsList" :key="'cr-' + i" class="radio-item"
-                            @click="onRadioSelect('specialTerms', 'specialTermsName', opt)">
-                            <view :class="['radio', { checked: form.specialTerms === opt.value }]" />
-                            <text class="label">{{ opt.label }}</text>
-                        </view>
-                    </view>
-                </view>
-                <view class="group">
-                    <view class="group-title">执行标准</view>
-                    <view class="radio-list">
-                        <view v-for="(opt, i) in executionStandardList" :key="'es-' + i" class="radio-item"
-                            @click="onRadioSelect('executionStandard', 'executionStandardName', opt)">
-                            <view :class="['radio', { checked: form.executionStandard === opt.value }]" />
-                            <text class="label">{{ opt.label }}</text>
-                        </view>
-                    </view>
-                </view>
+                <uni-list-item class="select-item" :class="form.specialTermsName ? 'is-filled' : 'is-empty'" clickable
+                    @click="openSheet('specialTerms')" :rightText="form.specialTermsName || '请选择'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text class="required">*</text><text>特别条款要求</text></view>
+                    </template>
+                </uni-list-item>
+                <uni-list-item class="select-item" :class="form.executionStandardName ? 'is-filled' : 'is-empty'" clickable
+                    @click="openSheet('executionStandard')" :rightText="form.executionStandardName || '请选择'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text>执行标准</text></view>
+                    </template>
+                </uni-list-item>
                 <uni-list-item v-if="form.executionStandard === 'OTHER'" title="其他">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.executionStandardRemarks" placeholder="请输入其他标准备注"
                             :inputBorder="false" />
                     </template>
                 </uni-list-item>
-                <uni-list-item title="特别说明">
+                <uni-list-item title="特别说明"  style="margin-top: 20rpx;">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.specialInstructions" placeholder="请输入特别说明" :inputBorder="false" />
                     </template>
@@ -177,15 +169,15 @@
                 <div class="total-text">合计</div>
                 <div class="total-item">
                     <div class="total-item-text">数量</div>
-                    <div class="total-item-price">{{ (sumQuantity || 0).toFixed(2) }}t</div>
+                    <div class="total-item-price">{{ (totalQuantity || 0).toFixed(2) }}kg</div>
                 </div>
                 <div class="total-item">
                     <div class="total-item-text">不含税金额</div>
-                    <div class="total-item-price text-red">￥{{ (sumAmountExcl || 0).toFixed(2) }}</div>
+                    <div class="total-item-price text-red">￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}</div>
                 </div>
                 <div class="total-item">
                     <div class="total-item-text">总金额</div>
-                    <div class="total-item-price text-red">￥{{ (sumTotal || 0).toFixed(2) }}</div>
+                    <div class="total-item-price text-red">￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}</div>
                 </div>
             </div>
             <button class="btn submit" type="primary" @click="onSubmit">保存</button>
@@ -223,6 +215,7 @@ export default {
                 workshopId: '',
                 workshopName: '',
                 orderDate: '',
+                deliveryDate: '',
                 designatedConsignee: '',
                 specialTerms: '',
                 specialTermsName: '',
@@ -256,9 +249,9 @@ export default {
             yesNoList: [{ label: '是', value: true }, { label: '否', value: false }],
             sheet: { visible: false, title: '请选择', field: '', options: [], value: '' },
             relate: { visible: false, title: '选择', source: '', display: [], multiple: false, rowKey: 'id', selectedKeys: [], fieldKey: '' },
-            sumQuantity: 0,
-            sumAmountExcl: 0,
-            sumTotal: 0,
+            totalQuantity: 0,
+            totalAmountExcludingTax: 0,
+            totalAmountIncludingTax: 0,
             productLineList: [],
             newProductLineList: [],
             productList: []
@@ -349,9 +342,9 @@ export default {
             const sumQ = list.reduce((acc, it) => acc + (parseFloat(it.quantity) || 0), 0)
             const sumE = list.reduce((acc, it) => acc + (parseFloat(it.amountExcludingTax) || 0), 0)
             const sumT = list.reduce((acc, it) => acc + (parseFloat(it.totalAmount) || 0), 0)
-            this.sumQuantity = sumQ
-            this.sumAmountExcl = sumE
-            this.sumTotal = sumT
+            this.totalQuantity = sumQ
+            this.totalAmountExcludingTax = sumE
+            this.totalAmountIncludingTax = sumT
             this.form.totalAmountCapital = formatCurrencyToChinese(sumT)
         },
         async loadSuppliers() {
@@ -399,6 +392,10 @@ export default {
                 setSheet('生产厂', opts)
             } else if (field === 'supplier') {
                 setSheet('供方', this.supplierList)
+            } else if (field === 'specialTerms') {
+                setSheet('特别条款要求', this.specialTermsList)
+            } else if (field === 'executionStandard') {
+                setSheet('执行标准', this.executionStandardList)
             } else if (field === 'includesPackagingFee') {
                 setSheet('单价中是否已包含包装费', this.yesNoList)
             } else if (field === 'includesTransportFee') {
@@ -443,18 +440,30 @@ export default {
                 { key: 'supplier', label: '供方' },
                 { key: 'buyer', label: '需方' },
                 { key: 'orderDate', label: '订货日期' },
+                { key: 'unit', label: '单位' },
                 { key: 'workshopId', label: '生产厂' },
+                { key: 'specialTerms', label: '特别条款要求' },
             ]
             for (const it of checks) {
                 const val = this.form[it.key]
                 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
                 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
             }
-            if (!Array.isArray(this.productLineList) || this.productLineList.length === 0) {
+            const list = Array.isArray(this.newProductLineList) ? this.newProductLineList : []
+            if (list.length === 0) {
                 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false
             }
-            for (const [idx, it] of this.productLineList.entries()) {
-                if (!it.productName || !it.quantity) {
+            const strEmpty = (v) => (v === undefined || v === null || (typeof v === 'string' && v.trim() === ''))
+            const numEmpty = (v) => (v === undefined || v === null || v === '' || (typeof v === 'number' && isNaN(v)))
+            for (const [idx, it] of list.entries()) {
+                if (
+                    strEmpty(it.productName) ||
+                    strEmpty(it.industry) ||
+                    strEmpty(it.quality) ||
+                    strEmpty(it.brand) ||
+                    numEmpty(it.quantity) ||
+                    strEmpty(it.deliveryDate)
+                ) {
                     uni.showToast({ title: `第${idx + 1}条明细未完整填写`, icon: 'none' }); return false
                 }
             }
@@ -486,9 +495,9 @@ export default {
                 id: this.form.id,
                 destination,
                 type: 'DIST_STOCK_CONTRACT',
-                sumQuantity: this.sumQuantity,
-                sumAmountExcl: this.sumAmountExcl,
-                sumTotal: this.sumTotal,
+                totalQuantity: this.totalQuantity,
+                totalAmountExcludingTax: this.totalAmountExcludingTax,
+                totalAmountIncludingTax: this.totalAmountIncludingTax,
                 contractDistributorLineList: lines
             })
             try {
@@ -524,7 +533,7 @@ export default {
         color: rgba(0, 0, 0, 0.6);
         line-height: 32rpx;
         width: 240rpx;
-        padding: 24rpx 0;
+        padding: 12rpx 0;
     }
 
     .total-item-price {
@@ -547,7 +556,7 @@ export default {
 
 .scroll {
     flex: 1;
-    padding: 12rpx 0 480rpx !important;
+    padding: 12rpx 0 392rpx !important;
 }
 
 .footer {
@@ -742,4 +751,4 @@ export default {
                 }
             }
                
-</style>
\ No newline at end of file
+</style>

@@ -53,53 +53,53 @@
                             <uni-easyinput v-model="item.quality" :inputBorder="false" placeholder="请输入品质" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="厚度">
+                    <uni-list-item title="厚度(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.thickness" :inputBorder="false" placeholder="请输入厚度" />
+                            <uni-easyinput type="digit" v-model="item.thickness" :inputBorder="false" placeholder="请输入厚度" @input="onNonNegativeInput(idx, 'thickness')" @blur="onNonNegativeBlur(idx, 'thickness', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="厚度公差(单项+)">
+                    <uni-list-item title="厚度公差上限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.thicknessTolPos" :inputBorder="false"
-                                placeholder="请输入厚度公差(单项+)" />
+                            <uni-easyinput type="digit" v-model="item.thicknessTolPos" :inputBorder="false"
+                                placeholder="请输入厚度公差上限" @input="onNonNegativeInput(idx, 'thicknessTolPos')" @blur="onNonNegativeBlur(idx, 'thicknessTolPos', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="厚度公差(单项-)">
+                    <uni-list-item title="厚度公差下限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.thicknessTolNeg" :inputBorder="false"
-                                placeholder="请输入厚度公差(单项-)" />
+                            <uni-easyinput type="digit" v-model="item.thicknessTolNeg" :inputBorder="false"
+                                placeholder="请输入厚度公差下限" @input="onNonNegativeInput(idx, 'thicknessTolNeg')" @blur="onNonNegativeBlur(idx, 'thicknessTolNeg', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="宽度">
+                    <uni-list-item title="宽度(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.width" :inputBorder="false" placeholder="请输入宽度" />
+                            <uni-easyinput type="digit" v-model="item.width" :inputBorder="false" placeholder="请输入宽度" @input="onNonNegativeInput(idx, 'width')" @blur="onNonNegativeBlur(idx, 'width', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="宽度公差(单项+)">
+                    <uni-list-item title="宽度公差上限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差(单项+)" />
+                            <uni-easyinput type="digit" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差上限" @input="onNonNegativeInput(idx, 'widthTolPos')" @blur="onNonNegativeBlur(idx, 'widthTolPos', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="宽度公差(单项-)">
+                    <uni-list-item title="宽度公差下限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差(单项-)" />
+                            <uni-easyinput type="digit" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差下限" @input="onNonNegativeInput(idx, 'widthTolNeg')" @blur="onNonNegativeBlur(idx, 'widthTolNeg', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="长度">
+                    <uni-list-item title="长度(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.length" :inputBorder="false" placeholder="请输入长度" />
+                            <uni-easyinput type="digit" v-model="item.length" :inputBorder="false" placeholder="请输入长度" @input="onNonNegativeInput(idx, 'length')" @blur="onNonNegativeBlur(idx, 'length', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="长度公差(单项+)">
+                    <uni-list-item title="长度公差上限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.lengthTolPos" :inputBorder="false"
-                                placeholder="请输入长度公差(单项+)" />
+                            <uni-easyinput type="digit" v-model="item.lengthTolPos" :inputBorder="false"
+                                placeholder="请输入长度公差上限" @input="onNonNegativeInput(idx, 'lengthTolPos')" @blur="onNonNegativeBlur(idx, 'lengthTolPos', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="长度公差(单项-)">
+                    <uni-list-item title="长度公差下限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.lengthTolNeg" :inputBorder="false"
-                                placeholder="请输入长度公差(单项-)" />
+                            <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false"
+                                placeholder="请输入长度公差下限" @input="onNonNegativeInput(idx, 'lengthTolNeg')" @blur="onNonNegativeBlur(idx, 'lengthTolNeg', 2)" />
                         </template>
                     </uni-list-item>
                     <uni-list-item title="状态">
@@ -109,12 +109,12 @@
                     </uni-list-item>
                     <uni-list-item title="数量">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.quantity" type="number" :inputBorder="false" placeholder="请输入数量" @input="onImmediateChange(idx)" @blur="onNumberBlur(idx, 'quantity', 0)" />
+                            <uni-easyinput v-model="item.quantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'quantity')" @blur="onNonNegativeBlur(idx, 'quantity', 2)" />
                         </template>
                     </uni-list-item>
                     <uni-list-item title="单价">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.unitPrice" type="number" :inputBorder="false" placeholder="-" @input="onImmediateChange(idx)" @blur="onNumberBlur(idx, 'unitPrice', 0)" disabled />
+                            <uni-easyinput v-model="item.unitPrice" type="digit" :inputBorder="false" disabled placeholder="请输入销售价格" @input="onNonNegativeInput(idx, 'unitPrice')" @blur="onNonNegativeBlur(idx, 'unitPrice', 2)" />
                         </template>
                     </uni-list-item>
                     <uni-list-item title="不含税金额">
@@ -129,7 +129,7 @@
                     </uni-list-item>
                     <uni-list-item title="发货日期">
                         <template v-slot:footer>
-                            <uni-datetime-picker type="date" v-model="item.orderDate" @change="onDateChange(idx, $event)" />
+                            <uni-datetime-picker :start="minDeliveryDate" type="date" v-model="item.deliveryDate" @change="onDateChange(idx, $event)" />
                         </template>
                     </uni-list-item>
                 </uni-list>
@@ -151,7 +151,30 @@
                 <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>
                 <view class="row"><text class="label">品质</text><text class="value">{{ item.quality }}</text></view>
-                <view class="row"><text class="label">规格</text><text class="value">{{ item.specDisplay }}</text></view>
+                    <!-- 厚（公差） * 宽（公差） * 长（公差） -->
+                    <view class="row row-spec"><text class="label">规格(mm)</text>
+                        <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 }}
+                                </view>
+                                <view v-if="item.thicknessTolNeg" class="value-spec_box_2">-{{ 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 }}</view>
+                                <view v-if="item.widthTolNeg" class="value-spec_box_2">-{{ 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 }}</view>
+                                <view v-if="item.lengthTolNeg" class="value-spec_box_2">-{{ item.lengthTolNeg }}</view>
+                            </view>
+                        </view>
+                    </view>
                 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view>
                 <view class="row"><text class="label">数量</text><text class="value">{{ item.quantity }}</text></view>
                 <view class="row"><text class="label">单价</text><text class="value">{{ formatCurrency(item.unitPrice)
@@ -162,7 +185,7 @@
                         }}</text></view>
                 <view class="row"><text class="label">总金额</text><text class="value">{{ formatCurrency(item.totalAmount)
                         }}</text></view>
-                <view class="row"><text class="label">发货日期</text><text class="value">{{ item.orderDate }}</text></view>
+                <view class="row"><text class="label">发货日期</text><text class="value">{{ item.deliveryDate }}</text></view>
             </view>
         </view>
             <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value" @confirm="onProductConfirm" />
@@ -176,7 +199,8 @@ export default {
         mode: { type: String, default: 'add' },
         list: { type: Array, default: () => [] },
         max: { type: Number, default: 8 },
-        orderDateBase: { type: String, default: '' },
+        deliveryDateBase: { type: String, default: '' },
+        deliveryDate: { type: String, default: '' },
         options: { type: Array, default: () => [] }
     },
     components: { SingleSelectSheet },
@@ -194,6 +218,22 @@ export default {
         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)
       }))
+    },
+
+    minDeliveryDate() {
+      const s = this.deliveryDate
+      if (!s) return ''
+      const parts = String(s).split('-')
+      const y = Number(parts[0])
+      const m = Number(parts[1])
+      const d = Number(parts[2])
+      if (!y || !m || !d) return ''
+      const dt = new Date(y, m - 1, d)
+      dt.setDate(dt.getDate() + 1)
+      const yy = dt.getFullYear()
+      const mm = String(dt.getMonth() + 1).padStart(2, '0')
+      const dd = String(dt.getDate() - 1).padStart(2, '0')
+      return `${yy}/${mm}/${dd}`
     }
   },
   watch: {
@@ -218,10 +258,18 @@ export default {
   },
   methods: {
         defaultItem() {
-            return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, orderDate: '' }
+            return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '' }
         },
-        onImmediateChange(idx) {
-            this.$nextTick(() => this.recalculate(idx))
+        onNonNegativeInput(idx, field) {
+            const it = this.items[idx]
+            if (!it) return
+            let v = String(it[field] != null ? it[field] : '')
+            v = v.replace(/[^0-9.]/g, '')
+            v = v.replace(/(\..*)\./g, '$1')
+            if (v.startsWith('.')) v = '0' + v
+            it[field] = v
+            this.$set(this.items, idx, it)
+            if (field === 'quantity' || field === 'unitPrice') this.$nextTick(() => this.recalculate(idx))
         },
         toNumber(val) {
             if (typeof val === 'number') return isNaN(val) ? 0 : val
@@ -234,21 +282,21 @@ export default {
             const m = Math.pow(10, digits)
             return Math.round(n * m) / m
         },
-        onNumberBlur(idx, field, digits) {
+        onNonNegativeBlur(idx, field, digits) {
             const it = this.items[idx]
             if (!it) return
             const raw = it[field]
-            // 如果为空则保持为空，不自动置为0，仅重新计算依赖字段
             if (raw === '' || raw === null || raw === undefined) {
                 this.$set(this.items, idx, it)
-                this.recalculate(idx)
+                if (field === 'quantity' || field === 'unitPrice') this.recalculate(idx)
                 return
             }
-            const num = this.toNumber(raw)
+            let num = this.toNumber(raw)
+            if (isNaN(num) || num < 0) num = 0
             const rounded = this.round(num, digits)
             it[field] = rounded
             this.$set(this.items, idx, it)
-            this.recalculate(idx)
+            if (field === 'quantity' || field === 'unitPrice') this.recalculate(idx)
         },
         formatCurrency(val) {
             if (val == null || val === '') return ''
@@ -319,15 +367,15 @@ export default {
         onDateChange(idx, e) {
             const it = this.items[idx]
             if (!it) return
-            const val = typeof e === 'string' ? e : (e && e.detail && e.detail.value) ? e.detail.value : it.orderDate
+            const val = typeof e === 'string' ? e : (e && e.detail && e.detail.value) ? e.detail.value : it.deliveryDate
             const dateStr = String(val).slice(0, 10)
-            const base = this.orderDateBase ? new Date(this.orderDateBase) : null
+            const base = this.deliveryDateBase ? new Date(this.deliveryDateBase) : null
             const d = new Date(dateStr)
             if (base && !isNaN(d.getTime()) && d.getTime() < base.getTime()) {
                 uni.showToast({ title: '发货日期不得早于订货日期', icon: 'none' })
-                it.orderDate = this.orderDateBase
+                it.deliveryDate = this.deliveryDateBase
             } else {
-                it.orderDate = dateStr
+                it.deliveryDate = dateStr
             }
             this.$set(this.items, idx, it)
         },
@@ -500,8 +548,46 @@ export default {
 
 .value {
     flex: 1;
-    text-align: right;
+    // text-align: right;
     color: rgba(0, 0, 0, 0.9);
     font-size: 28rpx;
 }
+   .value-spec {
+        height: 48rpx;
+        display: flex;
+        align-items: center;
+        color: #000000;
+        // justify-content: end;
+        &_box {
+            position: relative;
+            width: 60rpx;
+            height: 48rpx;
+
+            &_1 {
+                font-size: 16rpx;
+                position: absolute;
+                top: -10rpx;
+                left: 0;
+            }
+
+            &_2 {
+                font-size: 16rpx;
+                position: absolute;
+                bottom: -10rpx;
+                left: 0;
+            }
+        }
+
+        &_val {
+            font-size: 28rpx;
+
+            &.p12 {
+                padding-right: 12rpx;
+            }
+        }
+    }
+        .row-spec {
+            height: 60rpx;
+            align-items: center;
+        }
 </style>

@@ -25,7 +25,7 @@
 
 <script>
 import DetailButtons from '@/components/detail-buttons/index.vue'
-import { getSpecDetailApi } from '@/api/contract.js'
+import { getSpecDetailApi, cancelApi } from '@/api/contract.js'
 
 export default {
   components: { DetailButtons },
@@ -35,14 +35,24 @@ export default {
       form: {
         id: '', contractCode: '', customerName: '', deptName: '', workshopName: '', contractType: '', contractDocumentDate: '', applicationCount: '', totalQuantity: '', specLockDate: '', delayReason: '', orderDate: ''
         
-      }
+      },
+      buttons: [
+        { text: '编辑', variant: 'outline', visible: true, event: 'edit' },
+        { text: '审核', variant: 'outline', visible: true, event: 'audit' },
+        { text: '审核详情', variant: 'outline', visible: true, event: 'auditDetail' },
+        { text: '取消', variant: 'danger', visible: true, event: 'cancel' },
+      ]
     }
   },
   computed: {
     displayButtons() {
+      const s = this.form.approvalStatus || false
+      const e = this.form.showExamine || false
       return [
-        // { text: '删除', variant: 'danger' },
-        { text: '编辑', variant: 'outline' }
+        { ...this.buttons[0], visible: (s === 'REFUSE' && this.$auth.hasPermi('contract-manage:unlocked-operation-application:modify')) },
+        { ...this.buttons[1], visible: (s === 'AUDIT' && e && this.$auth.hasPermi('contract-manage:unlocked-operation-application:approve')) },
+        { ...this.buttons[2], visible: (s !== 'REFUSE' && this.$auth.hasPermi('contract-manage:unlocked-operation-application:review')) },
+        { ...this.buttons[3], visible: (s === 'REFUSE' && this.$auth.hasPermi('contract-manage:unlocked-operation-application:cancel')) },
       ]
     }
   },
@@ -60,6 +70,7 @@ export default {
         const m = d || {}
         const yesNo = m.hasFrameworkAgreement === 'Y' || m.hasFrameworkAgreement === true
         this.form = {
+          ...res.data || {},
           id: m.id || '',
           contractCode: m.contractCode || '',
           customerName: m.customerName || (m.customer && m.customer.name) || '',
@@ -75,13 +86,52 @@ export default {
         }
       })
     },
+    onEdit() {
+      if (!this.form.id) return
+      uni.navigateTo({ url: `/pages/contract_unlocked_operation/modify?id=${this.form.id}` })
+    },
+    onAudit(id, type) {
+        const CACHE_KEY = 'sourceBusinessId'
+        // const TYPE = 'contractType'
+        // uni.setStorageSync(TYPE, type)
+        uni.setStorageSync(CACHE_KEY, id)
+        uni.navigateTo({ url: '/pages/flow/audit' })
+    },
+    onAuditDetail(id, type) {
+      console.log(id,'id')
+        const CACHE_KEY = 'sourceBusinessId'
+        // const TYPE = 'contractType'
+        // uni.setStorageSync(TYPE, type)
+        uni.setStorageSync(CACHE_KEY, id)
+        uni.navigateTo({ url: '/pages/flow/audit_detail' })
+    },
+    onCancel(id) {
+        uni.showModal({
+            title: '确认取消吗？',
+            success: (res) => {
+                if (res.confirm) {
+                    uni.showLoading({ title: '取消中...' })
+                    cancelApi(id).then(res => {
+                        uni.hideLoading()
+                        if (res.code === 200) {
+                            uni.showToast({ title: '取消成功' })
+                            this.loadDetail()
+                        } else {
+                            uni.showToast({ title: res.msg || '取消失败' })
+                        }
+                    })
+                }
+            }
+        })
+    },
     handleButtonClick(btn) {
-      if (btn && btn.text === '编辑') {
-        return uni.navigateTo({ url: `/pages/contract_unlocked_operation/modify?id=${this.id}` })
-      }
-      // if (btn && btn.text === '删除') {
-      //   uni.showToast({ title: '暂未接入删除接口', icon: 'none' })
-      // }
+      if (!btn || btn.disabled) return
+      if (typeof btn.onClick === 'function') return btn.onClick(this.form, btn.params)
+      const e = btn.event || ''
+      if (e === 'edit') return this.onEdit(btn && btn.params)
+      if (e === 'audit') return this.onAudit(this.form.id || '')
+      if (e === 'auditDetail') return this.onAuditDetail(this.form.id || '')
+      if (e === 'cancel') return this.onCancel(this.form.id || '')
     }
   }
 }

@@ -6,7 +6,7 @@
           cancelButton="none" bgColor="#F3F3F3" textColor="rgba(0,0,0,0.4)" @confirm="search" @input="onSearchInput" />
         <view class="tool-icons">
           <!-- <image class="tool-icon" src="/static/images/dev_manage/add_icon.png" @click="onAdd" /> -->
-          <!-- <image class="tool-icon" src="/static/images/dev_manage/filter_icon.png" @click="openFilter" /> -->
+          <image class="tool-icon" src="/static/images/dev_manage/filter_icon.png" @click="openFilter" />
         </view>
       </view>
 
@@ -39,22 +39,19 @@
       </card-list>
     </view>
     <!-- 筛选弹框 -->
-    <!-- <filter-modal :visible.sync="filterVisible" :value.sync="filterForm" title="筛选" @reset="onFilterReset"
+    <filter-modal :visible.sync="filterVisible" :value.sync="filterForm" title="筛选" @reset="onFilterReset"
       @confirm="onFilterConfirm">
       <template v-slot="{ model }">
         <view class="filter-form">
           <view class="form-item">
-            <view class="label">品种</view>
+            <view class="label">审核状态</view>
             <uni-data-checkbox mode="tag" :multiple="false" :value-field="'value'" :text-field="'text'"
-              v-model="model.materialTypeId" @change="onMaterialTypeChange" :localdata="materialTypeOptions" />
-          </view>
-          <view class="form-item">
-            <view class="label">授权截止时间</view>
-            <uni-datetime-picker type="daterange" v-model="model.dateRange" start="2023-01-01" />
+              v-model="model.approvalStatus" @change="onApprovalStatusChange" :localdata="auditStatusOptions" />
           </view>
+
         </view>
       </template>
-    </filter-modal> -->
+    </filter-modal>
   </view>
 </template>
 
@@ -74,13 +71,14 @@ export default {
       // 批量选择
       batchMode: false,
       // 给到 card 的筛选值
-      query: { materialTypeId: '', dateRange: [] },
+      query: { materialTypeId: '', dateRange: [], approvalStatus: '' },
       extraParams: {},
 
       // 筛选弹框
       filterVisible: false,
-      filterForm: { materialTypeId: '', dateRange: [] },
+      filterForm: { materialTypeId: '', dateRange: [], approvalStatus: '' },
       materialTypeOptions: [],
+      auditStatusOptions: [],
       statusMap
     }
 
@@ -93,6 +91,7 @@ export default {
   },
   created() {
     this.getProductVariety();
+    this.loadAuditStatusOptions();
   },
   // 页面触底兜底：当页面自身滚动到底部时，转调卡片组件加载更多
   onReachBottom() {
@@ -162,6 +161,9 @@ export default {
     },
     onFilterConfirm(payload) {
       // 合并筛选值
+      if ((payload.approvalStatus === '' || payload.approvalStatus == null) && this.filterForm.approvalStatus !== '') {
+        payload.approvalStatus = this.filterForm.approvalStatus
+      }
       this.query = { ...this.query, ...payload }
     },
     onMaterialTypeChange(e) {
@@ -198,6 +200,22 @@ export default {
         }))
       })
     },
+    async loadAuditStatusOptions() {
+      try {
+        const dicCodes = ['AUDIT_STATUS']
+        const results = await getDicByCodes(dicCodes)
+        const option = (results.AUDIT_STATUS && results.AUDIT_STATUS.data) || []
+        this.auditStatusOptions = option.map(it => ({ value: it.code, text: it.name }))
+      } catch (e) {
+        this.auditStatusOptions = []
+      }
+    },
+    onApprovalStatusChange(e) {
+      const raw = e && e.detail && e.detail.value !== undefined
+        ? e.detail.value
+        : (e && e.value !== undefined ? e.value : '')
+      this.filterForm.approvalStatus = raw
+    },
   }
 }
 </script>

@@ -39,7 +39,7 @@
 						<view class="item-title"><text class="required">*</text><text>生产厂</text></view>
 					</template>
 				</uni-list-item>
-                <ProductRel mode="add" :orderDateBase="form.orderDate" @change="onProductsChange" :options="productList" />
+                <ProductRel mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" @change="onProductsChange" :options="productList" />
                 <uni-list-item title="合计人民币金额（大写）">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false" disabled />
@@ -92,33 +92,25 @@
                             :inputBorder="false" />
                     </template>
                 </uni-list-item>
-                <view class="group">
-                    <view class="group-title">特别条款要求</view>
-                    <view class="radio-list">
-                        <view v-for="(opt, i) in specialTermsList" :key="'cr-' + i" class="radio-item"
-                            @click="onRadioSelect('specialTerms', 'specialTermsName', opt)">
-                            <view :class="['radio', { checked: form.specialTerms === opt.value }]" />
-                            <text class="label">{{ opt.label }}</text>
-                        </view>
-                    </view>
-                </view>
-                <view class="group">
-                    <view class="group-title">执行标准</view>
-                    <view class="radio-list">
-                        <view v-for="(opt, i) in executionStandardList" :key="'es-' + i" class="radio-item"
-                            @click="onRadioSelect('executionStandard', 'executionStandardName', opt)">
-                            <view :class="['radio', { checked: form.executionStandard === opt.value }]" />
-                            <text class="label">{{ opt.label }}</text>
-                        </view>
-                    </view>
-                </view>
+                <uni-list-item class="select-item" :class="form.specialTermsName ? 'is-filled' : 'is-empty'" clickable
+                    @click="openSheet('specialTerms')" :rightText="form.specialTermsName || '请选择'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text class="required">*</text><text>特别条款要求</text></view>
+                    </template>
+                </uni-list-item>
+                <uni-list-item class="select-item" :class="form.executionStandardName ? 'is-filled' : 'is-empty'" clickable
+                    @click="openSheet('executionStandard')" :rightText="form.executionStandardName || '请选择'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text>执行标准</text></view>
+                    </template>
+                </uni-list-item>
                 <uni-list-item v-if="form.executionStandard === 'OTHER'" title="其他">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.executionStandardRemarks" placeholder="请输入其他标准备注"
                             :inputBorder="false" />
                     </template>
                 </uni-list-item>
-                <uni-list-item title="特别说明">
+                <uni-list-item title="特别说明"  style="margin-top: 20rpx;">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.specialInstructions" placeholder="请输入特别说明" :inputBorder="false" />
                     </template>
@@ -180,8 +172,8 @@
                     <div class="total-item-text">
                         数量
                     </div>
-                    <div class="total-item-price">
-                        {{ (sumQuantity || 0).toFixed(2) }}t
+                 <div class="total-item-price">
+                        {{ (totalQuantity || 0).toFixed(2) }}kg
                     </div>
                 </div>
                 <div class="total-item">
@@ -189,7 +181,7 @@
                         不含税金额
                     </div>
                     <div class="total-item-price text-red">
-                        ￥{{ (sumAmountExcl || 0).toFixed(2) }}
+                        ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}
                     </div>
                 </div>
                 <div class="total-item">
@@ -197,7 +189,7 @@
                         总金额
                     </div>
                     <div class="total-item-price text-red">
-                        ￥{{ (sumTotal || 0).toFixed(2) }}
+                        ￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}
                     </div>
                 </div>
             </div>
@@ -233,6 +225,7 @@ export default {
                 buyer: '',
                 buyerName: '',
                 orderDate: '',
+                deliveryDate: '',
                 designatedConsignee: '',
                 specialTerms: '',
                 specialTermsName: '',
@@ -263,9 +256,9 @@ export default {
             yesNoList: [{ label: '是', value: true }, { label: '否', value: false }],
             sheet: { visible: false, title: '请选择', field: '', options: [], value: '' },
             relate: { visible: false, title: '选择', source: '', display: [], multiple: false, rowKey: 'id', selectedKeys: [], fieldKey: '' },
-            sumQuantity: 0,
-            sumAmountExcl: 0,
-            sumTotal: 0,
+            totalQuantity: 0,
+            totalAmountExcludingTax: 0,
+            totalAmountIncludingTax: 0,
             productLineList: [],
             productList: [],
             customerRemarks: [],
@@ -308,6 +301,8 @@ export default {
         productLineList: {
             deep: true,
             handler(newVal, oldVal) {
+                console.log('newVal', newVal)
+                console.log('oldVal', oldVal)
                 const n = Array.isArray(newVal) ? newVal : []
                 const o = Array.isArray(oldVal) ? oldVal : []
                 const changed = []
@@ -364,13 +359,14 @@ export default {
         });
       },
         onProductsChange(products) {
+            console.log('products', products)
             const list = Array.isArray(products) ? products : []
             const sumQ = list.reduce((acc, it) => acc + (parseFloat(it.quantity) || 0), 0)
             const sumE = list.reduce((acc, it) => acc + (parseFloat(it.amountExcludingTax) || 0), 0)
             const sumT = list.reduce((acc, it) => acc + (parseFloat(it.totalAmount) || 0), 0)
-            this.sumQuantity = sumQ
-            this.sumAmountExcl = sumE
-            this.sumTotal = sumT
+            this.totalQuantity = sumQ
+            this.totalAmountExcludingTax = sumE
+            this.totalAmountIncludingTax = sumT
             this.form.totalAmountCapital = formatCurrencyToChinese(sumT)
             this.productLineList = list
         },
@@ -446,6 +442,10 @@ export default {
                 setSheet('生产厂', opts)
             } else if (field === 'supplier') {
                 setSheet('供方', this.supplierList)
+            } else if (field === 'specialTerms') {
+                setSheet('特别条款要求', this.specialTermsList)
+            } else if (field === 'executionStandard') {
+                setSheet('执行标准', this.executionStandardList)
             } else if (field === 'includesPackagingFee') {
                 setSheet('单价中是否已包含包装费', this.yesNoList)
             } else if (field === 'includesTransportFee') {
@@ -516,9 +516,9 @@ export default {
                 ...formForSubmit,
                 destination,
                 type: 'DRAFT_DIST_AGMT',
-                sumQuantity: this.sumQuantity,
-                sumAmountExcl: this.sumAmountExcl,
-                sumTotal: this.sumTotal,
+                totalQuantity: this.totalQuantity,
+                totalAmountExcludingTax: this.totalAmountExcludingTax,
+                totalAmountIncludingTax: this.totalAmountIncludingTax,
                 contractDistributorLineList: lines
             })
             console.log('onSubmit__payload', payload)
@@ -537,18 +537,31 @@ export default {
                 { key: 'supplier', label: '供方' },
                 { key: 'buyer', label: '需方' },
                 { key: 'orderDate', label: '订货日期' },
+                { key: 'unit', label: '单位' },
                 { key: 'workshopId', label: '生产厂' },
+                { key: 'specialTerms', label: '特别条款要求' },
             ]
             for (const it of checks) {
                 const val = this.form[it.key]
                 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
                 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
             }
-            if (!Array.isArray(this.productLineList) || this.productLineList.length === 0) {
+            const list = Array.isArray(this.productLineList) ? this.productLineList : []
+            if (list.length === 0) {
                 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false
             }
-            for (const [idx, it] of this.productLineList.entries()) {
-                if (!it.productName || !it.quantity || !it.unitPrice) {
+            const strEmpty = (v) => (v === undefined || v === null || (typeof v === 'string' && v.trim() === ''))
+            const numEmpty = (v) => (v === undefined || v === null || v === '' || (typeof v === 'number' && isNaN(v)))
+            for (const [idx, it] of list.entries()) {
+                if (
+                    strEmpty(it.productName) ||
+                    strEmpty(it.industry) ||
+                    strEmpty(it.quality) ||
+                    strEmpty(it.brand) ||
+                    numEmpty(it.quantity) ||
+                    numEmpty(it.unitPrice) ||
+                    strEmpty(it.deliveryDate)
+                ) {
                     uni.showToast({ title: `第${idx + 1}条明细未完整填写`, icon: 'none' }); return false
                 }
             }
@@ -576,7 +589,7 @@ export default {
             color: rgba(0, 0, 0, 0.6);
             line-height: 32rpx;
             width: 240rpx;
-            padding: 24rpx 0;
+            padding: 12rpx 0;
         }
         .total-item-price {
             font-weight: 600;
@@ -598,7 +611,7 @@ export default {
 
 .scroll {
   flex: 1;
-  padding: 12rpx 0 480rpx !important;
+  padding: 12rpx 0 392rpx !important;
 }
 
 .footer {

@@ -53,7 +53,7 @@
                     }}</text></view>
                 </view>
 
-                <view class="section">
+                <view class="section" v-if="detail.status === 'STANDARD'">
                     <view class="row"><text class="label">规范性合同</text><text class="value" style="color: #3D48A3;">{{
                         detail.standardFileName || '-'
                             }}</text></view>
@@ -61,7 +61,7 @@
                         detail.standardStandardized ? '是' : '否'
                             }}</text></view>
                 </view>
-                <view class="section" v-if="status === 'FORMAL'">
+                <view class="section" v-if="detail.status === 'FORMAL'">
                     <view class="row"><text class="label">规范性合同</text><text class="value" style="color: #3D48A3;">{{
                         detail.formalFileName || '-' }}</text></view>
                     <view class="row"><text class="label">合同是否规范</text><text class="value">{{ detail.formalStandardized
@@ -114,7 +114,7 @@
 </template>
 
 <script>
-import { getContractApi, deleteContractApi, uploadFormalContract, statusStyle } from '@/api/contract'
+import { getContractApi, deleteContractApi, uploadFormalContract, statusStyle, uploadStandardContract } from '@/api/contract'
 import ProductRel from './productRel.vue'
 import DetailButtons from '@/components/detail-buttons/index.vue'
 import FileUpload from '@/components/file-upload/index.vue'
@@ -265,19 +265,19 @@ export default {
             const e = this.detail.showExamine || false
             const f = this.detail.standardShowExamine || false
             return [
-                { ...this.buttons[0], visible: (s === 'DRAFT') },
-                { ...this.buttons[1], visible: (s === 'DRAFT') },
-                { ...this.buttons[2], visible: (s === 'FORMAL' && !l) },
-                { ...this.buttons[3], visible: (s === 'FORMAL' && !l) },
-                { ...this.buttons[4], visible: ((s === 'DRAFT' || s === 'FORMAL') && t !== 'AUDIT' && t !== 'PASS') },
-                { ...this.buttons[5], visible: (s === 'STANDARD' && t !== 'AUDIT' && t !== 'PASS') },
-                { ...this.buttons[6], visible: (s === 'STANDARD' && a !== 'AUDIT' && a !== 'PASS') },
-                { ...this.buttons[7], visible: (s === 'FORMAL' && e && t === 'AUDIT') },
-                { ...this.buttons[8], visible: (s === 'STANDARD' && e && t === 'AUDIT') },
-                { ...this.buttons[9], visible: (s === 'STANDARD' && f && a === 'AUDIT') },
-                { ...this.buttons[10], visible: (s === 'FORMAL' && t) },
-                { ...this.buttons[11], visible: (s === 'STANDARD' && t) },
-                { ...this.buttons[12], visible: (s === 'STANDARD' && a) },
+                { ...this.buttons[0], visible: (s === 'DRAFT' && this.$auth.hasPermi('contract-manage:distribution-unlocked-contract:modify')) },
+                { ...this.buttons[1], visible: (s === 'DRAFT' && this.$auth.hasPermi('contract-manage:distribution-unlocked-contract:delete')) },
+                { ...this.buttons[2], visible: (s === 'FORMAL' && !l && this.$auth.hasPermi('contract-manage:distribution-unlocked-contract:lock')) },
+                { ...this.buttons[3], visible: (s === 'FORMAL' && !l && this.$auth.hasPermi('contract-manage:distribution-unlocked-contract:lock-apply')) },
+                { ...this.buttons[4], visible: ((s === 'DRAFT' || s === 'FORMAL') && t !== 'AUDIT' && t !== 'PASS' && this.$auth.hasPermi('contract-manage:distribution-unlocked-contract:upload')) },
+                { ...this.buttons[5], visible: (s === 'STANDARD' && t !== 'AUDIT' && t !== 'PASS' && this.$auth.hasPermi('contract-manage:distribution-unlocked-contract:upload')) },
+                { ...this.buttons[6], visible: (s === 'STANDARD' && a !== 'AUDIT' && a !== 'PASS' && this.$auth.hasPermi('contract-manage:distribution-unlocked-contract:standard-upload')) },
+                { ...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[9], visible: (s === 'STANDARD' && f && a === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-unlocked-contract:standard-approve')) },
+                { ...this.buttons[10], visible: (s === 'FORMAL' && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-unlocked-contract:review')) },
+                { ...this.buttons[11], visible: (s === 'STANDARD' && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-unlocked-contract:review')) },
+                { ...this.buttons[12], visible: (s === 'STANDARD' && a === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-unlocked-contract:standard-review')) },
             ]
         }
     },

@@ -14,7 +14,7 @@
           @input="onSearchInput"
         />
         <view class="tool-icons">
-          <image class="tool-icon" src="/static/images/dev_manage/add_icon.png" @click="onAdd" />
+          <image v-if="$auth.hasPermi('contract-manage:distribution-unlocked-contract:add')" class="tool-icon" src="/static/images/dev_manage/add_icon.png" @click="onAdd" />
           <image class="tool-icon" src="/static/images/dev_manage/filter_icon.png" @click="openFilter" />
         </view>
       </view>
@@ -61,7 +61,9 @@
               <text>订单总额</text><text class="amount" :style="{ color: '#b67a76' }">{{ item.totalAmountIncludingTax ? '¥' : '' }}{{ formatAmount(item.totalAmountIncludingTax) || '-' }}</text>
             </view>
             <view class="info-row" v-if="item.status === 'STANDARD' || item.status === 'FORMAL'">
-              <text>{{ item.status === 'STANDARD' ? '标准合同' : '正式合同' }}规范性审核状态</text><span class="info-status" :style="item.standardApprovedName ? getStatusCss(item.standardApprovedName) : ''">{{ item.standardApprovedName || '-' }}</span>
+              <text>{{ item.status === 'STANDARD' ? '标准合同' : '正式合同' }}规范性审核状态</text>
+              <span v-if="item.status === 'STANDARD' ? item.standardApprovedName : item.formalApprovedName" class="info-status" :style="getStatusCss(item.status === 'STANDARD' ? item.standardApprovedName : item.formalApprovedName)">{{ item.status === 'STANDARD' ? item.standardApprovedName : item.formalApprovedName }}</span>
+              <span v-else>-</span>            
             </view>
             <view class="info-row">
               <text>订货日期</text><text>{{ item.orderDate }}</text>

@@ -107,7 +107,7 @@
                         数量
                     </div>
                     <div class="total-item-price">
-                        {{ (sumQuantity || 0).toFixed(2) }}t
+                        {{ (totalQuantity || 0).toFixed(2) }}kg
                     </div>
                 </div>
                 <div class="total-item">
@@ -115,7 +115,7 @@
                         不含税金额
                     </div>
                     <div class="total-item-price text-red">
-                        ￥{{ (sumAmountExcl || 0).toFixed(2) }}
+                        ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}
                     </div>
                 </div>
                 <div class="total-item">
@@ -123,7 +123,7 @@
                         总金额
                     </div>
                     <div class="total-item-price text-red">
-                        ￥{{ (sumTotal || 0).toFixed(2) }}
+                        ￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}
                     </div>
                 </div>
             </div>
@@ -146,15 +146,15 @@ export default {
         }
     },
   computed: {
-        sumQuantity() {
+        totalQuantity() {
             const qty = this.items.filter(it => it.locked).reduce((p, c) => p + this.toNumber(c.quantity), 0)
             return this.round(qty, 2)
         },
-        sumAmountExcl() {
+        totalAmountExcludingTax() {
             const sum = this.items.filter(it => it.locked).reduce((p, c) => p + this.toNumber(c.amountExcludingTax), 0)
             return this.round(sum, 2)
         },
-        sumTotal() { return this.totalAmount },
+        totalAmountIncludingTax() { return this.totalAmount },
         totalAmount() {
             let sum = 0
             for (const it of this.items) {
@@ -325,9 +325,9 @@ export default {
             const payload = {
                 id: this.id,
                 totalAmountCapital: formatCurrencyToChinese(this.sumTotal),
-                totalAmountExcludingTax: this.sumAmountExcl,
-                totalAmountIncludingTax: this.sumTotal,
-                totalQuantity: this.sumQuantity,
+                totalAmountExcludingTax: this.totalAmountExcludingTax,
+                totalAmountIncludingTax: this.totalAmountIncludingTax,
+                totalQuantity: this.totalQuantity,
                 type:'DRAFT_DIST_AGMT',
                 contractDistributorLineList: selected
             }
@@ -362,7 +362,7 @@ export default {
 
 .scroll {
     flex: 1;
-    padding: 12rpx 0 480rpx !important;
+    padding: 12rpx 0 392rpx !important;
 }
 
 .header {
@@ -646,7 +646,7 @@ export default {
             color: rgba(0, 0, 0, 0.6);
             line-height: 32rpx;
             width: 240rpx;
-            padding: 24rpx 0;
+            padding: 12rpx 0;
         }
 
         .total-item-price {

@@ -41,7 +41,7 @@
                     </template>
                 </uni-list-item>
 
-                <ProductRel mode="add" :orderDateBase="form.orderDate" :list="productLineList" @change="onProductsChange" :options="productList" />
+                <ProductRel mode="add" :deliveryDateBase="form.deliveryDate" :deliveryDate="form.orderDate" :list="productLineList" @change="onProductsChange" :options="productList" />
 
                 <uni-list-item title="合计人民币金额（大写）">
                     <template v-slot:footer>
@@ -99,33 +99,25 @@
                     </template>
                 </uni-list-item>
 
-                <view class="group">
-                    <view class="group-title">特别条款要求</view>
-                    <view class="radio-list">
-                        <view v-for="(opt, i) in specialTermsList" :key="'cr-' + i" class="radio-item"
-                            @click="onRadioSelect('specialTerms', 'specialTermsName', opt)">
-                            <view :class="['radio', { checked: form.specialTerms === opt.value }]" />
-                            <text class="label">{{ opt.label }}</text>
-                        </view>
-                    </view>
-                </view>
-                <view class="group">
-                    <view class="group-title">执行标准</view>
-                    <view class="radio-list">
-                        <view v-for="(opt, i) in executionStandardList" :key="'es-' + i" class="radio-item"
-                            @click="onRadioSelect('executionStandard', 'executionStandardName', opt)">
-                            <view :class="['radio', { checked: form.executionStandard === opt.value }]" />
-                            <text class="label">{{ opt.label }}</text>
-                        </view>
-                    </view>
-                </view>
+                <uni-list-item class="select-item" :class="form.specialTermsName ? 'is-filled' : 'is-empty'" clickable
+                    @click="openSheet('specialTerms')" :rightText="form.specialTermsName || '请选择'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text class="required">*</text><text>特别条款要求</text></view>
+                    </template>
+                </uni-list-item>
+                <uni-list-item class="select-item" :class="form.executionStandardName ? 'is-filled' : 'is-empty'" clickable
+                    @click="openSheet('executionStandard')" :rightText="form.executionStandardName || '请选择'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text>执行标准</text></view>
+                    </template>
+                </uni-list-item>
                 <uni-list-item v-if="form.executionStandard === 'OTHER'" title="其他">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.executionStandardRemarks" placeholder="请输入其他标准备注"
                             :inputBorder="false" />
                     </template>
                 </uni-list-item>
-                <uni-list-item title="特别说明">
+                <uni-list-item title="特别说明"  style="margin-top: 20rpx;">
                     <template v-slot:footer>
                         <uni-easyinput v-model="form.specialInstructions" placeholder="请输入特别说明" :inputBorder="false" />
                     </template>
@@ -177,15 +169,15 @@
                 <div class="total-text">合计</div>
                 <div class="total-item">
                     <div class="total-item-text">数量</div>
-                    <div class="total-item-price">{{ (sumQuantity || 0).toFixed(2) }}t</div>
+                    <div class="total-item-price">{{ (totalQuantity || 0).toFixed(2) }}kg</div>
                 </div>
                 <div class="total-item">
                     <div class="total-item-text">不含税金额</div>
-                    <div class="total-item-price text-red">￥{{ (sumAmountExcl || 0).toFixed(2) }}</div>
+                    <div class="total-item-price text-red">￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}</div>
                 </div>
                 <div class="total-item">
                     <div class="total-item-text">总金额</div>
-                    <div class="total-item-price text-red">￥{{ (sumTotal || 0).toFixed(2) }}</div>
+                    <div class="total-item-price text-red">￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}</div>
                 </div>
             </div>
             <button class="btn submit" type="primary" @click="onSubmit">保存</button>
@@ -223,6 +215,7 @@ export default {
                 workshopId: '',
                 workshopName: '',
                 orderDate: '',
+                deliveryDate: '',
                 designatedConsignee: '',
                 specialTerms: '',
                 specialTermsName: '',
@@ -256,9 +249,9 @@ export default {
             yesNoList: [{ label: '是', value: true }, { label: '否', value: false }],
             sheet: { visible: false, title: '请选择', field: '', options: [], value: '' },
             relate: { visible: false, title: '选择', source: '', display: [], multiple: false, rowKey: 'id', selectedKeys: [], fieldKey: '' },
-            sumQuantity: 0,
-            sumAmountExcl: 0,
-            sumTotal: 0,
+            totalQuantity: 0,
+            totalAmountExcludingTax: 0,
+            totalAmountIncludingTax: 0,
             productLineList: [],
             newProductLineList: [],
             productList: []
@@ -349,9 +342,9 @@ export default {
             const sumQ = list.reduce((acc, it) => acc + (parseFloat(it.quantity) || 0), 0)
             const sumE = list.reduce((acc, it) => acc + (parseFloat(it.amountExcludingTax) || 0), 0)
             const sumT = list.reduce((acc, it) => acc + (parseFloat(it.totalAmount) || 0), 0)
-            this.sumQuantity = sumQ
-            this.sumAmountExcl = sumE
-            this.sumTotal = sumT
+            this.totalQuantity = sumQ
+            this.totalAmountExcludingTax = sumE
+            this.totalAmountIncludingTax = sumT
             this.form.totalAmountCapital = formatCurrencyToChinese(sumT)
         },
         async loadSuppliers() {
@@ -399,6 +392,10 @@ export default {
                 setSheet('生产厂', opts)
             } else if (field === 'supplier') {
                 setSheet('供方', this.supplierList)
+            } else if (field === 'specialTerms') {
+                setSheet('特别条款要求', this.specialTermsList)
+            } else if (field === 'executionStandard') {
+                setSheet('执行标准', this.executionStandardList)
             } else if (field === 'includesPackagingFee') {
                 setSheet('单价中是否已包含包装费', this.yesNoList)
             } else if (field === 'includesTransportFee') {
@@ -439,22 +436,35 @@ export default {
         },
         validateRequired() {
             const checks = [
-                { key: 'code', label: '编号' },
+           { key: 'code', label: '编号' },
                 { key: 'supplier', label: '供方' },
                 { key: 'buyer', label: '需方' },
                 { key: 'orderDate', label: '订货日期' },
+                { key: 'unit', label: '单位' },
                 { key: 'workshopId', label: '生产厂' },
+                { key: 'specialTerms', label: '特别条款要求' },
             ]
             for (const it of checks) {
                 const val = this.form[it.key]
                 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
                 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
             }
-            if (!Array.isArray(this.productLineList) || this.productLineList.length === 0) {
+            const list = Array.isArray(this.newProductLineList) ? this.newProductLineList : []
+            if (list.length === 0) {
                 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false
             }
-            for (const [idx, it] of this.productLineList.entries()) {
-                if (!it.productName || !it.quantity || !it.unitPrice) {
+            const strEmpty = (v) => (v === undefined || v === null || (typeof v === 'string' && v.trim() === ''))
+            const numEmpty = (v) => (v === undefined || v === null || v === '' || (typeof v === 'number' && isNaN(v)))
+            for (const [idx, it] of list.entries()) {
+                if (
+                    strEmpty(it.productName) ||
+                    strEmpty(it.industry) ||
+                    strEmpty(it.quality) ||
+                    strEmpty(it.brand) ||
+                    numEmpty(it.quantity) ||
+                    strEmpty(it.unitPrice) ||
+                    strEmpty(it.deliveryDate)
+                ) {
                     uni.showToast({ title: `第${idx + 1}条明细未完整填写`, icon: 'none' }); return false
                 }
             }
@@ -486,9 +496,9 @@ export default {
                 id: this.form.id,
                 destination,
                 type: 'DRAFT_DIST_AGMT',
-                sumQuantity: this.sumQuantity,
-                sumAmountExcl: this.sumAmountExcl,
-                sumTotal: this.sumTotal,
+                totalQuantity: this.totalQuantity,
+                totalAmountExcludingTax: this.totalAmountExcludingTax,
+                totalAmountIncludingTax: this.totalAmountIncludingTax,
                 contractDistributorLineList: lines
             })
             try {
@@ -524,7 +534,7 @@ export default {
         color: rgba(0, 0, 0, 0.6);
         line-height: 32rpx;
         width: 240rpx;
-        padding: 24rpx 0;
+         padding: 12rpx 0;
     }
 
     .total-item-price {
@@ -547,7 +557,7 @@ export default {
 
 .scroll {
     flex: 1;
-    padding: 12rpx 0 480rpx !important;
+    padding: 12rpx 0 392rpx !important;
 }
 
 .footer {

@@ -53,53 +53,53 @@
                             <uni-easyinput v-model="item.quality" :inputBorder="false" placeholder="请输入品质" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="厚度">
+                    <uni-list-item title="厚度(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.thickness" :inputBorder="false" placeholder="请输入厚度" />
+                            <uni-easyinput type="digit" v-model="item.thickness" :inputBorder="false" placeholder="请输入厚度" @input="onNonNegativeInput(idx, 'thickness')" @blur="onNonNegativeBlur(idx, 'thickness', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="厚度公差(单项+)">
+                    <uni-list-item title="厚度公差上限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.thicknessTolPos" :inputBorder="false"
-                                placeholder="请输入厚度公差(单项+)" />
+                            <uni-easyinput type="digit" v-model="item.thicknessTolPos" :inputBorder="false"
+                                placeholder="请输入厚度公差上限" @input="onNonNegativeInput(idx, 'thicknessTolPos')" @blur="onNonNegativeBlur(idx, 'thicknessTolPos', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="厚度公差(单项-)">
+                    <uni-list-item title="厚度公差下限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.thicknessTolNeg" :inputBorder="false"
-                                placeholder="请输入厚度公差(单项-)" />
+                            <uni-easyinput type="digit" v-model="item.thicknessTolNeg" :inputBorder="false"
+                                placeholder="请输入厚度公差下限" @input="onNonNegativeInput(idx, 'thicknessTolNeg')" @blur="onNonNegativeBlur(idx, 'thicknessTolNeg', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="宽度">
+                    <uni-list-item title="宽度(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.width" :inputBorder="false" placeholder="请输入宽度" />
+                            <uni-easyinput type="digit" v-model="item.width" :inputBorder="false" placeholder="请输入宽度" @input="onNonNegativeInput(idx, 'width')" @blur="onNonNegativeBlur(idx, 'width', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="宽度公差(单项+)">
+                    <uni-list-item title="宽度公差上限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差(单项+)" />
+                            <uni-easyinput type="digit" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差上限" @input="onNonNegativeInput(idx, 'widthTolPos')" @blur="onNonNegativeBlur(idx, 'widthTolPos', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="宽度公差(单项-)">
+                    <uni-list-item title="宽度公差下限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差(单项-)" />
+                            <uni-easyinput type="digit" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差下限" @input="onNonNegativeInput(idx, 'widthTolNeg')" @blur="onNonNegativeBlur(idx, 'widthTolNeg', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="长度">
+                    <uni-list-item title="长度(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.length" :inputBorder="false" placeholder="请输入长度" />
+                            <uni-easyinput type="digit" v-model="item.length" :inputBorder="false" placeholder="请输入长度" @input="onNonNegativeInput(idx, 'length')" @blur="onNonNegativeBlur(idx, 'length', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="长度公差(单项+)">
+                    <uni-list-item title="长度公差上限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.lengthTolPos" :inputBorder="false"
-                                placeholder="请输入长度公差(单项+)" />
+                            <uni-easyinput type="digit" v-model="item.lengthTolPos" :inputBorder="false"
+                                placeholder="请输入长度公差上限" @input="onNonNegativeInput(idx, 'lengthTolPos')" @blur="onNonNegativeBlur(idx, 'lengthTolPos', 2)" />
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="长度公差(单项-)">
+                    <uni-list-item title="长度公差下限(mm)">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.lengthTolNeg" :inputBorder="false"
-                                placeholder="请输入长度公差(单项-)" />
+                            <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false"
+                                placeholder="请输入长度公差下限" @input="onNonNegativeInput(idx, 'lengthTolNeg')" @blur="onNonNegativeBlur(idx, 'lengthTolNeg', 2)" />
                         </template>
                     </uni-list-item>
                     <uni-list-item title="状态">
@@ -109,12 +109,12 @@
                     </uni-list-item>
                     <uni-list-item title="数量">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.quantity" type="number" :inputBorder="false" placeholder="请输入数量" @input="onImmediateChange(idx)" @blur="onNumberBlur(idx, 'quantity', 0)" />
+                            <uni-easyinput v-model="item.quantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'quantity')" @blur="onNonNegativeBlur(idx, 'quantity', 2)" />
                         </template>
                     </uni-list-item>
                     <uni-list-item title="单价">
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.unitPrice" type="number" :inputBorder="false" placeholder="请输入单价" @input="onImmediateChange(idx)" @blur="onNumberBlur(idx, 'unitPrice', 0)" />
+                            <uni-easyinput v-model="item.unitPrice" type="digit" :inputBorder="false" placeholder="请输入销售价格" @input="onNonNegativeInput(idx, 'unitPrice')" @blur="onNonNegativeBlur(idx, 'unitPrice', 2)" />
                         </template>
                     </uni-list-item>
                     <uni-list-item title="不含税金额">
@@ -129,7 +129,7 @@
                     </uni-list-item>
                     <uni-list-item title="发货日期">
                         <template v-slot:footer>
-                            <uni-datetime-picker type="date" v-model="item.orderDate" @change="onDateChange(idx, $event)" />
+                            <uni-datetime-picker  :start="minDeliveryDate" type="date" v-model="item.deliveryDate" @change="onDateChange(idx, $event)" />
                         </template>
                     </uni-list-item>
                 </uni-list>
@@ -151,7 +151,30 @@
                 <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>
                 <view class="row"><text class="label">品质</text><text class="value">{{ item.quality }}</text></view>
-                <view class="row"><text class="label">规格</text><text class="value">{{ item.specDisplay }}</text></view>
+                    <!-- 厚（公差） * 宽（公差） * 长（公差） -->
+                    <view class="row row-spec"><text class="label">规格(mm)</text>
+                        <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 }}
+                                </view>
+                                <view v-if="item.thicknessTolNeg" class="value-spec_box_2">-{{ 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 }}</view>
+                                <view v-if="item.widthTolNeg" class="value-spec_box_2">-{{ 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 }}</view>
+                                <view v-if="item.lengthTolNeg" class="value-spec_box_2">-{{ item.lengthTolNeg }}</view>
+                            </view>
+                        </view>
+                    </view>
                 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view>
                 <view class="row"><text class="label">数量</text><text class="value">{{ item.quantity }}</text></view>
                 <view class="row"><text class="label">单价</text><text class="value">{{ formatCurrency(item.unitPrice)
@@ -162,7 +185,7 @@
                         }}</text></view>
                 <view class="row"><text class="label">总金额</text><text class="value">{{ formatCurrency(item.totalAmount)
                         }}</text></view>
-                <view class="row"><text class="label">发货日期</text><text class="value">{{ item.orderDate }}</text></view>
+                <view class="row"><text class="label">发货日期</text><text class="value">{{ item.deliveryDate }}</text></view>
             </view>
         </view>
             <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value" @confirm="onProductConfirm" />
@@ -176,7 +199,8 @@ export default {
         mode: { type: String, default: 'add' },
         list: { type: Array, default: () => [] },
         max: { type: Number, default: 8 },
-        orderDateBase: { type: String, default: '' },
+        deliveryDateBase: { type: String, default: '' },
+        deliveryDate: { type: String, default: '' },
         options: { type: Array, default: () => [] }
     },
     components: { SingleSelectSheet },
@@ -194,6 +218,21 @@ export default {
         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)
       }))
+    },
+    minDeliveryDate() {
+      const s = this.deliveryDate
+      if (!s) return ''
+      const parts = String(s).split('-')
+      const y = Number(parts[0])
+      const m = Number(parts[1])
+      const d = Number(parts[2])
+      if (!y || !m || !d) return ''
+      const dt = new Date(y, m - 1, d)
+      dt.setDate(dt.getDate() + 1)
+      const yy = dt.getFullYear()
+      const mm = String(dt.getMonth() + 1).padStart(2, '0')
+      const dd = String(dt.getDate() - 1).padStart(2, '0')
+      return `${yy}/${mm}/${dd}`
     }
   },
   watch: {
@@ -218,10 +257,18 @@ export default {
   },
   methods: {
         defaultItem() {
-            return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, orderDate: '' }
+            return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '' }
         },
-        onImmediateChange(idx) {
-            this.$nextTick(() => this.recalculate(idx))
+        onNonNegativeInput(idx, field) {
+            const it = this.items[idx]
+            if (!it) return
+            let v = String(it[field] != null ? it[field] : '')
+            v = v.replace(/[^0-9.]/g, '')
+            v = v.replace(/(\..*)\./g, '$1')
+            if (v.startsWith('.')) v = '0' + v
+            it[field] = v
+            this.$set(this.items, idx, it)
+            if (field === 'quantity' || field === 'unitPrice') this.$nextTick(() => this.recalculate(idx))
         },
         toNumber(val) {
             if (typeof val === 'number') return isNaN(val) ? 0 : val
@@ -234,21 +281,21 @@ export default {
             const m = Math.pow(10, digits)
             return Math.round(n * m) / m
         },
-        onNumberBlur(idx, field, digits) {
+        onNonNegativeBlur(idx, field, digits) {
             const it = this.items[idx]
             if (!it) return
             const raw = it[field]
-            // 如果为空则保持为空，不自动置为0，仅重新计算依赖字段
             if (raw === '' || raw === null || raw === undefined) {
                 this.$set(this.items, idx, it)
-                this.recalculate(idx)
+                if (field === 'quantity' || field === 'unitPrice') this.recalculate(idx)
                 return
             }
-            const num = this.toNumber(raw)
+            let num = this.toNumber(raw)
+            if (isNaN(num) || num < 0) num = 0
             const rounded = this.round(num, digits)
             it[field] = rounded
             this.$set(this.items, idx, it)
-            this.recalculate(idx)
+            if (field === 'quantity' || field === 'unitPrice') this.recalculate(idx)
         },
         formatCurrency(val) {
             if (val == null || val === '') return ''
@@ -319,15 +366,15 @@ export default {
         onDateChange(idx, e) {
             const it = this.items[idx]
             if (!it) return
-            const val = typeof e === 'string' ? e : (e && e.detail && e.detail.value) ? e.detail.value : it.orderDate
+            const val = typeof e === 'string' ? e : (e && e.detail && e.detail.value) ? e.detail.value : it.deliveryDate
             const dateStr = String(val).slice(0, 10)
-            const base = this.orderDateBase ? new Date(this.orderDateBase) : null
+            const base = this.deliveryDateBase ? new Date(this.deliveryDateBase) : null
             const d = new Date(dateStr)
             if (base && !isNaN(d.getTime()) && d.getTime() < base.getTime()) {
                 uni.showToast({ title: '发货日期不得早于订货日期', icon: 'none' })
-                it.orderDate = this.orderDateBase
+                it.deliveryDate = this.deliveryDateBase
             } else {
-                it.orderDate = dateStr
+                it.deliveryDate = dateStr
             }
             this.$set(this.items, idx, it)
         },
@@ -500,8 +547,46 @@ export default {
 
 .value {
     flex: 1;
-    text-align: right;
+    // text-align: right;
     color: rgba(0, 0, 0, 0.9);
     font-size: 28rpx;
 }
+   .value-spec {
+        height: 48rpx;
+        display: flex;
+        align-items: center;
+        color: #000000;
+        // justify-content: end;
+        &_box {
+            position: relative;
+            width: 60rpx;
+            height: 48rpx;
+
+            &_1 {
+                font-size: 16rpx;
+                position: absolute;
+                top: -10rpx;
+                left: 0;
+            }
+
+            &_2 {
+                font-size: 16rpx;
+                position: absolute;
+                bottom: -10rpx;
+                left: 0;
+            }
+        }
+
+        &_val {
+            font-size: 28rpx;
+
+            &.p12 {
+                padding-right: 12rpx;
+            }
+        }
+    }
+        .row-spec {
+            height: 60rpx;
+            align-items: center;
+        }
 </style>

@@ -14,9 +14,10 @@
           </template>
         </uni-list-item>
 
-        <uni-list-item title="区域">
-          <template v-slot:footer>
-            <uni-easyinput v-model="form.region" placeholder="请输入区域" :inputBorder="false" />
+        <uni-list-item class="select-item" :class="form.region ? 'is-filled' : 'is-empty'" clickable
+          @click="openSheet('region')" :rightText="displayLabel('regionName')" showArrow>
+          <template v-slot:body>
+            <view class="item-title"><text>区域</text></view>
           </template>
         </uni-list-item>
         <uni-list-item title="客户简称">
@@ -176,9 +177,9 @@
             <uni-easyinput v-model="form.majorCustomers" placeholder="请输入主要客户" :inputBorder="false" />
           </template>
         </uni-list-item>
-        <uni-list-item title="主营项目">
+        <uni-list-item class="mgb10" title="主营项目">
           <template v-slot:footer>
-            <uni-easyinput v-model="form.mainProjects" placeholder="请输入主营项目" :inputBorder="false" />
+            <uni-easyinput type="textarea" v-model="form.mainProjects" placeholder="请输入主营项目" :inputBorder="false" />
           </template>
         </uni-list-item>
         <uni-list-item title="从事行业">
@@ -316,7 +317,7 @@
 <script>
 import SingleSelectSheet from '@/components/single-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
-import { generateCreditCode, getAllUser, getDeptUser, createApi } from '@/api/credit_manage.js'
+import { generateCreditCode, getAllUser, getDeptUser, createApi, getArea } from '@/api/credit_manage.js'
 import { getDicByCodeApi } from '@/api/base.js'
 import CorePersonnel from './corePersonnel.vue'
 
@@ -328,6 +329,7 @@ export default {
       form: {
         serialNumber: '',
         region: '',
+        regionName: '',
         customerShortName: '',
         enterpriseType: '',
         enterpriseTypeName: '',
@@ -381,6 +383,7 @@ export default {
       sheet: { visible: false, title: '请选择', field: '', options: [], value: '' },
       relate: { visible: false, title: '选择', source: '', display: [], multiple: false, rowKey: 'id', selectedKeys: [], fieldKey: '' },
       enterpriseTypeOptions: [],
+      regionOptions: [],
       categoryOptions: [],
       companyCategoryOptions: [],
       investigatorOptions: [],
@@ -389,6 +392,7 @@ export default {
   },
   created() {
     this.loadSerialNumber()
+    this.loadRegionOptions()
     this.loadEnterpriseTypeOptions()
     this.loadCategoryOptions()
     this.loadCompanyCategoryOptions()
@@ -408,6 +412,7 @@ export default {
     displayLabel(field) {
       const m = this.form
       const map = {
+        regionName: '请选择区域',
         enterpriseTypeName: '请选择企业类型',
         suggestedCategoryName: '请选择建议客户分类',
       }
@@ -420,6 +425,9 @@ export default {
         const match = (options || []).find(o => String(o.label) === String(current) || String(o.value) === String(current))
         this.sheet = { ...this.sheet, visible: true, title, options, field, value: match ? match.value : '' }
       }
+      if (field === 'region') {
+        setSheet('区域', this.regionOptions)
+      } else
       if (field === 'enterpriseType') {
         setSheet('企业类型', this.enterpriseTypeOptions)
       } else if (field === 'suggestedCategory') {
@@ -490,6 +498,15 @@ export default {
         this.enterpriseTypeOptions = []
       }
     },
+    async loadRegionOptions() {
+      try {
+        const res = await getArea()
+        const list = res.data || []
+        this.regionOptions = (list || []).map(it => ({ label: it.name || '', value: it.id || '' }))
+      } catch (e) {
+        this.regionOptions = []
+      }
+    },
     async loadCategoryOptions() {
       try {
         const res = await getDicByCodeApi('CUSTOMER_CATEGORY')
@@ -552,13 +569,14 @@ export default {
       })
       console.log('onSubmit__payload_2', payload);
       delete payload.enterpriseTypeName
+      delete payload.regionName
       delete payload.suggestedCategoryName
       delete payload.companyIdName
       delete payload.investigatorName
       try {
         await createApi(payload)
         uni.showToast({ title: '提交成功', icon: 'success' })
-        setTimeout(() => uni.navigateBack(), 600)
+        setTimeout(() => { uni.redirectTo({ url: '/pages/credit_manage/index' }) }, 300)
       } catch (e) {
         uni.showToast({ title: (e && e.msg) || '提交失败', icon: 'none' })
       }
@@ -618,7 +636,6 @@ export default {
 
     &__container {
       padding: 32rpx;
-      align-items: center;
 
       .uni-easyinput {
 
@@ -743,4 +760,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>

@@ -13,9 +13,10 @@
           </template>
         </uni-list-item>
 
-        <uni-list-item title="区域">
-          <template v-slot:footer>
-            <uni-easyinput v-model="form.region" placeholder="请输入区域" :inputBorder="false" />
+        <uni-list-item class="select-item" :class="form.region ? 'is-filled' : 'is-empty'" clickable
+          @click="openSheet('region')" :rightText="displayLabel('regionName')" showArrow>
+          <template v-slot:body>
+            <view class="item-title"><text>区域</text></view>
           </template>
         </uni-list-item>
         <uni-list-item title="客户简称">
@@ -175,9 +176,9 @@
             <uni-easyinput v-model="form.majorCustomers" placeholder="请输入主要客户" :inputBorder="false" />
           </template>
         </uni-list-item>
-        <uni-list-item title="主营项目">
+        <uni-list-item class="mgb10" title="主营项目">
           <template v-slot:footer>
-            <uni-easyinput v-model="form.mainProjects" placeholder="请输入主营项目" :inputBorder="false" />
+            <uni-easyinput type="textarea" v-model="form.mainProjects" placeholder="请输入主营项目" :inputBorder="false" />
           </template>
         </uni-list-item>
         <uni-list-item title="从事行业">
@@ -314,7 +315,7 @@
 <script>
 import SingleSelectSheet from '@/components/single-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
-import { getDetailApi, updateApi, getAllUser } from '@/api/credit_manage.js'
+import { getDetailApi, updateApi, getAllUser, getArea } from '@/api/credit_manage.js'
 import { getDicByCodeApi } from '@/api/base.js'
 import CorePersonnel from './corePersonnel.vue'
 
@@ -328,6 +329,7 @@ export default {
         id: '',
         serialNumber: '',
         region: '',
+        regionName: '',
         customerShortName: '',
         enterpriseType: '',
         enterpriseTypeName: '',
@@ -383,6 +385,7 @@ export default {
       sheet: { visible: false, title: '请选择', field: '', options: [], value: '' },
       relate: { visible: false, title: '选择', source: '', display: [], multiple: false, rowKey: 'id', selectedKeys: [], fieldKey: '' },
       enterpriseTypeOptions: [],
+      regionOptions: [],
       categoryOptions: [],
       investigatorOptions: [],
       genderOptions: []
@@ -393,6 +396,7 @@ export default {
     if (this.id) this.loadDetail(this.id)
   },
   created() {
+    this.loadRegionOptions()
     this.loadEnterpriseTypeOptions()
     this.loadCategoryOptions()
     this.loadInvestigatorOptions()
@@ -400,6 +404,7 @@ export default {
   },
   watch: {
     enterpriseTypeOptions() { this.refreshLabelFields() },
+    regionOptions() { this.refreshLabelFields() },
     categoryOptions() { this.refreshLabelFields() },
     investigatorOptions() { this.refreshLabelFields() }
   },
@@ -425,6 +430,7 @@ export default {
     displayLabel(field) {
       const m = this.form
       const map = {
+        regionName: '请选择区域',
         enterpriseTypeName: '请选择企业类型',
         suggestedCategoryName: '请选择建议客户分类',
       }
@@ -433,9 +439,11 @@ export default {
     },
     refreshLabelFields() {
       const et = this.enterpriseTypeOptions.find(o => String(o.value) === String(this.form.enterpriseType))
+      const rn = this.regionOptions.find(o => String(o.value) === String(this.form.region))
       const ct = this.categoryOptions.find(o => String(o.value) === String(this.form.suggestedCategory))
       const iu = this.investigatorOptions.find(o => String(o.value) === String(this.form.investigator))
       this.form.enterpriseTypeName = et ? (et.label || '') : this.form.enterpriseTypeName
+      this.form.regionName = rn ? (rn.label || '') : this.form.regionName
       this.form.suggestedCategoryName = ct ? (ct.label || '') : this.form.suggestedCategoryName
       this.form.investigatorName = iu ? (iu.label || '') : this.form.investigatorName
     },
@@ -445,6 +453,9 @@ export default {
         const match = (options || []).find(o => String(o.label) === String(current) || String(o.value) === String(current))
         this.sheet = { ...this.sheet, visible: true, title, options, field, value: match ? match.value : '' }
       }
+      if (field === 'region') {
+        setSheet('区域', this.regionOptions)
+      } else
       if (field === 'enterpriseType') {
         setSheet('企业类型', this.enterpriseTypeOptions)
       } else if (field === 'suggestedCategory') {
@@ -515,6 +526,15 @@ export default {
         this.enterpriseTypeOptions = []
       }
     },
+    async loadRegionOptions() {
+      try {
+        const res = await getArea()
+        const list = res.data || []
+        this.regionOptions = (list || []).map(it => ({ label: it.name || '', value: it.id || '' }))
+      } catch (e) {
+        this.regionOptions = []
+      }
+    },
     async loadCategoryOptions() {
       try {
         const res = await getDicByCodeApi('CUSTOMER_CATEGORY')
@@ -557,6 +577,7 @@ export default {
         delete it.sexName
       })
       delete payload.enterpriseTypeName
+      delete payload.regionName
       delete payload.suggestedCategoryName
       delete payload.companyIdName
       delete payload.investigatorName
@@ -624,7 +645,6 @@ export default {
 
     &__container {
       padding: 32rpx;
-      align-items: center;
 
       .uni-easyinput {
 
@@ -738,4 +758,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>

@@ -6,7 +6,7 @@
           <text class="row company">{{ form.companyName }}</text>
           <view :class="['status', `status_${form.status}`]" />
           <view class="row"><text class="label">编号</text><text class="value">{{ form.serialNumber }}</text></view>
-          <view class="row"><text class="label">区域</text><text class="value">{{ form.region }}</text></view>
+          <view class="row"><text class="label">区域</text><text class="value">{{ form.regionName }}</text></view>
           <view class="row"><text class="label">客户简称</text><text class="value">{{ form.customerShortName }}</text>
           </view>
           <view class="row"><text class="label">企业类型</text><text class="value">{{ getDicName('ENTERPRISE_TYPE',
@@ -184,6 +184,7 @@ export default {
     return {
       form: {},
       enterpriseTypeOptions: [],
+      regionOptions: [],
       genderOptions: [],
       categoryOptions: [],
       historyList: [],
@@ -192,7 +193,7 @@ export default {
         { text: '审核详情', visible: true, variant: 'outline', event: 'auditDetail' },
         { text: '审核', visible: true, variant: 'primary', event: 'audit' },
         { text: '申请变更', visible: true, variant: 'outline', event: 'changeApply' },
-        { text: '取消', visible: true, variant: 'outline', event: 'cancel', style: { color: 'rgba(0,0,0,0.9)', border: '1px solid #DCDCDC' } },
+        { text: '取消', visible: true, vxrariant: 'outline', event: 'cancel', style: { color: 'rgba(0,0,0,0.9)', border: '1px solid #DCDCDC' } },
       ],
     }
   },
@@ -210,15 +211,16 @@ export default {
     displayButtons() {
       const f = this.statusFlags
       return [
-        { ...this.buttons[0], visible: f.isRefuse },
-        { ...this.buttons[1], visible: true },
-        { ...this.buttons[2], visible: f.isAudit && f.canExamine },
-        { ...this.buttons[3], visible: f.isPass },
-        { ...this.buttons[4], visible: f.isRefuse },
+        { ...this.buttons[0], visible: f.isRefuse && this.$auth.hasPermi('customer-credit-manage:customer-credit-plan:modify') },
+        { ...this.buttons[1], visible: this.$auth.hasPermi('customer-credit-manage:customer-credit-plan:review') },
+        { ...this.buttons[2], visible: f.isAudit && f.canExamine && this.$auth.hasPermi('customer-credit-manage:customer-credit-plan:approve') },
+        { ...this.buttons[3], visible: f.isPass && this.$auth.hasPermi('customer-credit-manage:customer-credit-plan:change') },
+        { ...this.buttons[4], visible: f.isRefuse && this.$auth.hasPermi('customer-credit-manage:customer-credit-plan:close') },
       ]
     }
   },
   created() {
+    this.loadRegionOptions()
     this.loadEnterpriseTypeOptions()
     this.loadGenderOptions()
     this.loadCategoryOptions()
@@ -248,6 +250,15 @@ export default {
         this.enterpriseTypeOptions = []
       }
     },
+    async loadRegionOptions() {
+      try {
+        const res = await getDicByCodeApi('CREDIT_ZONE')
+        const list = res.data || []
+        this.regionOptions = Array.isArray(list) ? list : []
+      } catch (e) {
+        this.regionOptions = []
+      }
+    },
     async loadGenderOptions() {
       try {
         const res = await getDicByCodeApi('GENDER_TYPE')
@@ -553,4 +564,4 @@ export default {
     font-weight: 600;
   }
 }
-</style>
\ No newline at end of file
+</style>

@@ -6,7 +6,7 @@
 					cancelButton="none" bgColor="#F3F3F3" textColor="rgba(0,0,0,0.4)" @confirm="search"
 					@input="onSearchInput" />
 				<view class="tool-icons">
-					<image class="tool-icon" src="/static/images/dev_manage/add_icon.png" @click="onAdd" />
+					<image v-if="$auth.hasPermi('customer-credit-manage:customer-credit-plan:add')" class="tool-icon" src="/static/images/dev_manage/add_icon.png" @click="onAdd" />
 					<image class="tool-icon" src="/static/images/dev_manage/filter_icon.png" @click="openFilter" />
 				</view>
 			</view>
@@ -33,7 +33,7 @@
 							<text>企业类型</text><text>{{ getDicName('ENTERPRISE_TYPE', item.enterpriseType, dicOptions.ENTERPRISE_TYPE) || '-' }}</text>
 						</view>
 						<view class="info-row">
-							<text>区域</text><text>{{ item.region || '-' }}</text>
+							<text>区域</text><text>{{ item.regionName || '-' }}</text>
 						</view>
 						<view class="info-row">
 							<text>客户分类</text><text
@@ -122,7 +122,8 @@
 				dicOptions: {
 					CUSTOMER_CATEGORY: [],
 					AUDIT_STATUS: [],
-					ENTERPRISE_TYPE: []
+					ENTERPRISE_TYPE: [],
+					CREDIT_ZONE: []
 				},
 				statusLocal: [],
 				categoryLocal: []
@@ -267,11 +268,12 @@
 					})
 			},
 			loadAllDicData() {
-				const dicCodes = ['CUSTOMER_CATEGORY', 'AUDIT_STATUS', 'ENTERPRISE_TYPE']
+				const dicCodes = ['CUSTOMER_CATEGORY', 'AUDIT_STATUS', 'ENTERPRISE_TYPE', 'CREDIT_ZONE']
 				return getDicByCodes(dicCodes).then(results => {
 					this.dicOptions.CUSTOMER_CATEGORY = results.CUSTOMER_CATEGORY.data || []
 					this.dicOptions.AUDIT_STATUS = results.AUDIT_STATUS.data || []
 					this.dicOptions.ENTERPRISE_TYPE = results.ENTERPRISE_TYPE.data || []
+					this.dicOptions.CREDIT_ZONE = results.CREDIT_ZONE.data || [];
 					this.categoryLocal = (this.dicOptions.CUSTOMER_CATEGORY || []).map(it => ({
 						value: it.code,
 						text: it.name
@@ -284,7 +286,8 @@
 					this.dicOptions = {
 						CUSTOMER_CATEGORY: [],
 						AUDIT_STATUS: [],
-						ENTERPRISE_TYPE: []
+						ENTERPRISE_TYPE: [],
+						CREDIT_ZONE: []
 					}
 					this.categoryLocal = []
 					this.statusLocal = []

@@ -13,9 +13,10 @@
           </template>
         </uni-list-item>
 
-        <uni-list-item title="区域">
-          <template v-slot:footer>
-            <uni-easyinput v-model="form.region" placeholder="请输入区域" :inputBorder="false" />
+        <uni-list-item class="select-item" :class="form.region ? 'is-filled' : 'is-empty'" clickable
+          @click="openSheet('region')" :rightText="displayLabel('regionName')" showArrow>
+          <template v-slot:body>
+            <view class="item-title"><text>区域</text></view>
           </template>
         </uni-list-item>
         <uni-list-item title="客户简称">
@@ -175,9 +176,9 @@
             <uni-easyinput v-model="form.majorCustomers" placeholder="请输入主要客户" :inputBorder="false" />
           </template>
         </uni-list-item>
-        <uni-list-item title="主营项目">
+        <uni-list-item class="mgb10" title="主营项目">
           <template v-slot:footer>
-            <uni-easyinput v-model="form.mainProjects" placeholder="请输入主营项目" :inputBorder="false" />
+            <uni-easyinput type="textarea" v-model="form.mainProjects" placeholder="请输入主营项目" :inputBorder="false" />
           </template>
         </uni-list-item>
         <uni-list-item title="从事行业">
@@ -314,7 +315,7 @@
 <script>
 import SingleSelectSheet from '@/components/single-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
-import { getDetailApi, updateApi, getAllUser } from '@/api/credit_manage.js'
+import { getDetailApi, updateApi, getAllUser, getArea } from '@/api/credit_manage.js'
 import { getDicByCodeApi } from '@/api/base.js'
 import CorePersonnel from './corePersonnel.vue'
 
@@ -328,6 +329,7 @@ export default {
         id: '',
         serialNumber: '',
         region: '',
+        regionName: '',
         customerShortName: '',
         enterpriseType: '',
         enterpriseTypeName: '',
@@ -383,6 +385,7 @@ export default {
       sheet: { visible: false, title: '请选择', field: '', options: [], value: '' },
       relate: { visible: false, title: '选择', source: '', display: [], multiple: false, rowKey: 'id', selectedKeys: [], fieldKey: '' },
       enterpriseTypeOptions: [],
+      regionOptions: [],
       categoryOptions: [],
       investigatorOptions: [],
       genderOptions: []
@@ -393,6 +396,7 @@ export default {
     if (this.id) this.loadDetail(this.id)
   },
   created() {
+    this.loadRegionOptions()
     this.loadEnterpriseTypeOptions()
     this.loadCategoryOptions()
     this.loadInvestigatorOptions()
@@ -400,6 +404,7 @@ export default {
   },
   watch: {
     enterpriseTypeOptions() { this.refreshLabelFields() },
+    regionOptions() { this.refreshLabelFields() },
     categoryOptions() { this.refreshLabelFields() },
     investigatorOptions() { this.refreshLabelFields() }
   },
@@ -425,6 +430,7 @@ export default {
     displayLabel(field) {
       const m = this.form
       const map = {
+        regionName: '请选择区域',
         enterpriseTypeName: '请选择企业类型',
         suggestedCategoryName: '请选择建议客户分类',
       }
@@ -433,9 +439,11 @@ export default {
     },
     refreshLabelFields() {
       const et = this.enterpriseTypeOptions.find(o => String(o.value) === String(this.form.enterpriseType))
+      const rn = this.regionOptions.find(o => String(o.value) === String(this.form.region))
       const ct = this.categoryOptions.find(o => String(o.value) === String(this.form.suggestedCategory))
       const iu = this.investigatorOptions.find(o => String(o.value) === String(this.form.investigator))
       this.form.enterpriseTypeName = et ? (et.label || '') : this.form.enterpriseTypeName
+      this.form.regionName = rn ? (rn.label || '') : this.form.regionName
       this.form.suggestedCategoryName = ct ? (ct.label || '') : this.form.suggestedCategoryName
       this.form.investigatorName = iu ? (iu.label || '') : this.form.investigatorName
     },
@@ -445,6 +453,9 @@ export default {
         const match = (options || []).find(o => String(o.label) === String(current) || String(o.value) === String(current))
         this.sheet = { ...this.sheet, visible: true, title, options, field, value: match ? match.value : '' }
       }
+      if (field === 'region') {
+        setSheet('区域', this.regionOptions)
+      } else
       if (field === 'enterpriseType') {
         setSheet('企业类型', this.enterpriseTypeOptions)
       } else if (field === 'suggestedCategory') {
@@ -515,6 +526,15 @@ export default {
         this.enterpriseTypeOptions = []
       }
     },
+    async loadRegionOptions() {
+      try {
+        const res = await getArea()
+        const list = res.data || []
+        this.regionOptions = (list || []).map(it => ({ label: it.name || '', value: it.id || '' }))
+      } catch (e) {
+        this.regionOptions = []
+      }
+    },
     async loadCategoryOptions() {
       try {
         const res = await getDicByCodeApi('CUSTOMER_CATEGORY')
@@ -557,6 +577,7 @@ export default {
         delete it.sexName
       })
       delete payload.enterpriseTypeName
+      delete payload.regionName
       delete payload.suggestedCategoryName
       delete payload.companyIdName
       delete payload.investigatorName
@@ -625,7 +646,6 @@ export default {
 
     &__container {
       padding: 32rpx;
-      align-items: center;
 
       .uni-easyinput {
 
@@ -739,4 +759,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>

@@ -3,7 +3,7 @@
         <view class="section">
             <text class="row company">{{ form.companyName }}</text>
             <view class="row"><text class="label">编号</text><text class="value">{{ form.serialNumber }}</text></view>
-            <view class="row"><text class="label">区域</text><text class="value">{{ form.region }}</text></view>
+            <view class="row"><text class="label">区域</text><text class="value">{{ form.regionName }}</text></view>
             <view class="row"><text class="label">客户简称</text><text class="value">{{ form.customerShortName }}</text>
             </view>
             <view class="row"><text class="label">企业类型</text><text class="value">{{ getDicName('ENTERPRISE_TYPE',
@@ -188,12 +188,14 @@ export default {
         return {
             form: {},
             enterpriseTypeOptions: [],
+            regionOptions: [],
             genderOptions: [],
             categoryOptions: [],
             historyList: []
         }
     },
     created() {
+        this.loadRegionOptions()
         this.loadEnterpriseTypeOptions()
         this.loadGenderOptions()
         this.loadCategoryOptions()
@@ -228,6 +230,15 @@ export default {
                 this.enterpriseTypeOptions = []
             }
         },
+        async loadRegionOptions() {
+            try {
+                const res = await getDicByCodeApi('CREDIT_ZONE')
+                const list = res.data || []
+                this.regionOptions = Array.isArray(list) ? list : []
+            } catch (e) {
+                this.regionOptions = []
+            }
+        },
         async loadGenderOptions() {
             try {
                 const res = await getDicByCodeApi('GENDER_TYPE')
@@ -427,4 +438,4 @@ export default {
 .mgb10 {
     margin-bottom: 20rpx;
 }
-</style>
\ No newline at end of file
+</style>

@@ -19,8 +19,8 @@
 				</uni-list-item>
 
 				<!-- 客户名称 关联页选择 -->
-				<uni-list-item class="select-item" :class="form.customerId ? 'is-filled' : 'is-empty'" clickable @click="openRelate('customerId')" :rightText="form.customerIdName || '请选择客户名称'"
-					showArrow>
+				<uni-list-item class="select-item" :class="form.customerId ? 'is-filled' : 'is-empty'" clickable
+					@click="openRelate('customerId')" :rightText="form.customerIdName || '请选择客户名称'" showArrow>
 					<template v-slot:body>
 						<view class="item-title"><text class="required">*</text><text>客户名称</text></view>
 					</template>
@@ -98,7 +98,8 @@
 				</uni-list-item>
 				<!-- 责任人 关联页选择 -->
 				<uni-list-item class="select-item" :class="form.chargeUserIdName ? 'is-filled' : 'is-empty'" title="责任人"
-					clickable @click="openRelate('chargeUserId')" :rightText="form.chargeUserIdName || '请选择责任人'" showArrow />
+					clickable @click="openRelate('chargeUserId')" :rightText="form.chargeUserIdName || '请选择责任人'"
+					showArrow />
 			</uni-list>
 
 		</scroll-view>
@@ -114,435 +115,441 @@
 		<!-- 关联选择弹框：客户名称、责任人 -->
 		<RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source"
 			:display-fields="relate.display" :multiple="relate.multiple" :row-key="relate.rowKey"
-			:selectedKeys.sync="relate.selectedKeys" :source-extra="{ source: 'CUSTOMER_DEVELOP' }" @confirm="onRelateConfirm" />
+			:selectedKeys.sync="relate.selectedKeys" :source-extra="{ source: 'CUSTOMER_DEVELOP' }"
+			@confirm="onRelateConfirm" />
 	</view>
 </template>
 
 <script>
-	import SingleSelectSheet from '@/components/single-select/index.vue'
-	import RelateSelectSheet from '@/components/relate-select/index.vue'
-	import constant from '@/utils/constant'
-	import storage from '@/utils/storage'
-	import {
-		createApi,
-		officeQueryApi,
-		productVarietyQueryApi,
-		workshopQueryApi
-	} from '@/api/devManage.js'
-	import {
-		getDicByCodeApi
-	} from '@/api/base.js'
+import SingleSelectSheet from '@/components/single-select/index.vue'
+import RelateSelectSheet from '@/components/relate-select/index.vue'
+import constant from '@/utils/constant'
+import storage from '@/utils/storage'
+import {
+	createApi,
+	officeQueryApi,
+	productVarietyQueryApi,
+	workshopQueryApi
+} from '@/api/devManage.js'
+import {
+	getDicByCodeApi
+} from '@/api/base.js'
 
-	export default {
-		name: 'DevManageAdd',
-		components: {
-			SingleSelectSheet,
-			RelateSelectSheet
-		},
-		data() {
-			return {
-				form: {
-					workshopIdName: '',
-					workshopId: '',
-					officeIdName: '',
-					officeId: '',
-					customerIdName: '',
-					customerId: '',
-					customerType: '',
-					customerTypeName: '',
-					chargeUserId: '',
-					chargeUserIdName: '',
-					productVarietyId: '',
-					productVarietyIdName: '',
-					monthlyUsage: '',
-					targetQuantity: '',
-					industry: '',
-					mark: '',
-					thickness: '',
-					width: '',
-					materialRequire: '',
-					qualityRequire: '',
-					peer: '',
-					pricingMode: '',
-					settleDays: '',
-				},
-				sheet: {
-					visible: false,
-					title: '请选择',
-					field: '',
-					options: [],
-					value: ''
-				},
-				relate: {
-					visible: false,
-					title: '选择',
-					source: '',
-					display: [],
-					multiple: false,
-					rowKey: 'id',
-					selectedKeys: []
-				},
-				officeOptions: [],
-				customerTypeOptions: [],
-				productVarietyIdOptions: []
-			}
-		},
-		created() {
-			// 责任人默认使用当前用户昵称/用户名
-			const user = storage.get(constant.name);
-			const userId = storage.get(constant.id);
-			this.form.chargeUserIdName = user || '';
-			this.form.chargeUserId = userId || '';
-			// 科办
-			this.loadOfficeOptions()
-			//  客户类型
-			this.loadCustomerTypeOptions()
-			//  生产厂
-			this.loadproductVarietyIdOptions()
-		},
-		methods: {
-			// 校验必填项：生产厂、科办、客户名称、客户类型、产品品种
-			validateRequired() {
-				const checks = [{
-						key: 'workshopId',
-						label: '生产厂'
-					},
-					{
-						key: 'officeId',
-						label: '科办'
-					},
-					{
-						key: 'customerId',
-						label: '客户名称'
-					},
-					{
-						key: 'customerType',
-						label: '客户类型'
-					},
-					{
-						key: 'productVarietyId',
-						label: '产品品种'
-					}
-				]
-				for (const it of checks) {
-					const val = this.form[it.key]
-					if (val === undefined || val === null || String(val).trim() === '') {
-						uni.showToast({
-							title: `请先选择${it.label}`,
-							icon: 'none'
-						})
-						return false
-					}
-				}
-				return true
+export default {
+	name: 'DevManageAdd',
+	components: {
+		SingleSelectSheet,
+		RelateSelectSheet
+	},
+	data() {
+		return {
+			form: {
+				workshopIdName: '',
+				workshopId: '',
+				officeIdName: '',
+				officeId: '',
+				customerIdName: '',
+				customerId: '',
+				customerType: '',
+				customerTypeName: '',
+				chargeUserId: '',
+				chargeUserIdName: '',
+				productVarietyId: '',
+				productVarietyIdName: '',
+				monthlyUsage: '',
+				targetQuantity: '',
+				industry: '',
+				mark: '',
+				thickness: '',
+				width: '',
+				materialRequire: '',
+				qualityRequire: '',
+				peer: '',
+				pricingMode: '',
+				settleDays: '',
 			},
-			async loadOfficeOptions() {
-				try {
-					const res = await officeQueryApi({
-						pageIndex: 1,
-						pageSize: 9999
-					})
-					const _data = res.data || {}
-					const list = _data.datas || []
-					this.officeOptions = (list || []).map(it => ({
-						label: it.name || it.text || it.officeName || it.label,
-						value: it.id || it.code || it.value
-					}))
-				} catch (e) {
-					this.officeOptions = []
-				}
+			sheet: {
+				visible: false,
+				title: '请选择',
+				field: '',
+				options: [],
+				value: ''
 			},
-			displayLabel(field) {
-				const m = this.form
-				const map = {
-					workshopIdName: '请选择生产厂',
-					officeIdName: '请选择科办',
-					customerTypeName: '请选择客户类型',
-					productVarietyIdName: '请选择产品品种'
-				}
-				const val = m[field]
-				return val ? String(val) : map[field]
+			relate: {
+				visible: false,
+				title: '选择',
+				source: '',
+				display: [],
+				multiple: false,
+				rowKey: 'id',
+				selectedKeys: []
 			},
-			async openSheet(field) {
-				const setSheet = (title, options) => {
-					const current = this.form[field]
-					const match = (options || []).find(o => String(o.label) === String(current) || String(o.value) === String(current))
-					this.sheet = {
-						...this.sheet,
-						visible: true,
-						title,
-						options,
-						field,
-						value: match ? match.value : ''
-					}
-				}
-				if (field === 'workshopId') {
-					const res = await workshopQueryApi({ pageIndex: 1, pageSize: 9999 })
-					const _data = res.data || {}
-					const list = _data.datas || (Array.isArray(_data) ? _data : [])
-					const opts = (list || []).map(it => ({
-						label: it.name ,
-						value: it.id
-					}))
-					setSheet('生产厂', opts)
-				} else if (field === 'officeId') {
-					setSheet('科办', this.officeOptions)
-				} else if (field === 'customerType') {
-					const opts = this.customerTypeOptions || [];
-					setSheet('客户类型', opts)
-				} else if (field === 'productVarietyId') {
-					const opts = this.productVarietyIdOptions;
-					setSheet('产品品种', opts)
-				}
-			},
-			onSheetConfirm({
-				value,
-				label
-			}) {
-				const field = this.sheet.field
-				if (!field) return
-				this.form[field] = value || '';
-				this.form[field + 'Name'] = label || ''
-				this.sheet.visible = false
-			},
-			openRelate(fieldKey) {
-				let config = {};
-				switch(fieldKey) {
-					case 'customerId':
-						config = {
-							title: '客户名称',
-							source: 'customer',
-							rowKey: 'id',
-							multiple: false,
-							display: [{
-									label: '名称',
-									field: 'name'
-								},
-								{
-									label: '编号',
-									field: 'code'
-								},
-								{
-									label: '状态',
-									field: 'available',
-									format: v => (v ? '启用' : '停用')
-								}
-							]
-						}
-						break
-					case 'chargeUserId':
-						config = {
-							title: '责任人',
-							source: 'user',
-							rowKey: 'id',
-							multiple: false,
-							display: [{
-									label: '姓名',
-									field: 'name'
-								},
-								{
-									label: '编号',
-									field: 'code'
-								},
-								{
-									label: '状态',
-									field: 'available',
-									format: v => (v ? '启用' : '停用')
-								}
-							]};
-						break
-				}
-				const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : [];
-				// 逐一赋值，避免整体替换对象导致子组件 prop 更新不及时
-				this.sheet.visible = false
-				this.relate.title = config.title
-				this.relate.source = config.source
-				this.relate.display = config.display
-				this.relate.multiple = config.multiple
-				this.relate.rowKey = config.rowKey
-				this.relate.selectedKeys = selectedKeys
-				this.relate.fieldKey = fieldKey;
-				// 最后再打开弹框，确保选中键已传入
-				this.$nextTick(() => {
-					this.relate.visible = true
-				})
+			officeOptions: [],
+			customerTypeOptions: [],
+			productVarietyIdOptions: []
+		}
+	},
+	created() {
+		// 责任人默认使用当前用户昵称/用户名
+		const user = storage.get(constant.name);
+		const userId = storage.get(constant.id);
+		this.form.chargeUserIdName = user || '';
+		this.form.chargeUserId = userId || '';
+		// 科办
+		this.loadOfficeOptions()
+		//  客户类型
+		this.loadCustomerTypeOptions()
+		//  生产厂
+		this.loadproductVarietyIdOptions()
+	},
+	methods: {
+		// 校验必填项：生产厂、科办、客户名称、客户类型、产品品种
+		validateRequired() {
+			const checks = [{
+				key: 'workshopId',
+				label: '生产厂'
 			},
-			onRelateConfirm({
-				items
-			}) {
-				console.log('onRelateConfirm__item', items)
-				const _fieldKey = this.relate.fieldKey;
-				console.log('onRelateConfirm__fieldKey', _fieldKey)
-				const first = (items && items.length > 0) ? items[0] : null
-				// 若无选中项，确认时清空之前的值
-				this.form[_fieldKey] = first.id || '';
-				this.form[_fieldKey + 'Name'] = first.name || '';
+			{
+				key: 'officeId',
+				label: '科办'
 			},
-			async loadCustomerTypeOptions() {
-				try {
-					const res = await getDicByCodeApi('ENTERPRISE_TYPE');
-					const list = res.data || [];
-					this.customerTypeOptions = (list || []).map(it => ({
-						label: it.name || '',
-						value: it.code || ''
-					}))
-				} catch (e) {
-					this.customerTypeOptions = []
-				}
+			{
+				key: 'customerId',
+				label: '客户名称'
 			},
-	
-			async loadproductVarietyIdOptions() {
-				try {
-					const res = await productVarietyQueryApi({ pageIndex: 1, pageSize: 9999 })
-					const _data = res.data || {}
-					const list = _data.datas || (Array.isArray(_data) ? _data : [])
-					this.productVarietyIdOptions = (list || []).map(it => ({
-						label: it.name || it.text || it.label,
-						value: it.id || it.code || it.value
-					}))
-				} catch (e) {
-					this.productVarietyIdOptions = []
-				}
+			{
+				key: 'customerType',
+				label: '客户类型'
 			},
-			async onSubmit() {
-				// 必填校验
-				if (!this.validateRequired()) return
-				const payload = {
-					...this.form
-				}
-				delete payload.workshopIdName
-				delete payload.officeIdName
-				delete payload.customerTypeName
-				delete payload.customerIdName
-				delete payload.productVarietyIdName
-				delete payload.chargeUserIdName
-				createApi(payload).then(res => {
-					uni.showToast({
-						title: '提交成功',
-						icon: 'success'
-					})
-					setTimeout(() => uni.navigateBack(), 600)
-				}).catch(e => {
-					console.log('createApi__e', e)
+			{
+				key: 'productVarietyId',
+				label: '产品品种'
+			}
+			]
+			for (const it of checks) {
+				const val = this.form[it.key]
+				if (val === undefined || val === null || String(val).trim() === '') {
 					uni.showToast({
-						title: e.msg || '提交失败',
+						title: `请先选择${it.label}`,
 						icon: 'none'
 					})
+					return false
+				}
+			}
+			return true
+		},
+		async loadOfficeOptions() {
+			try {
+				const res = await officeQueryApi({
+					pageIndex: 1,
+					pageSize: 9999
 				})
+				const _data = res.data || {}
+				const list = _data.datas || []
+				this.officeOptions = (list || []).map(it => ({
+					label: it.name || it.text || it.officeName || it.label,
+					value: it.id || it.code || it.value
+				}))
+			} catch (e) {
+				this.officeOptions = []
+			}
+		},
+		displayLabel(field) {
+			const m = this.form
+			const map = {
+				workshopIdName: '请选择生产厂',
+				officeIdName: '请选择科办',
+				customerTypeName: '请选择客户类型',
+				productVarietyIdName: '请选择产品品种'
+			}
+			const val = m[field]
+			return val ? String(val) : map[field]
+		},
+		async openSheet(field) {
+			const setSheet = (title, options) => {
+				const current = this.form[field]
+				const match = (options || []).find(o => String(o.label) === String(current) || String(o.value) === String(current))
+				this.sheet = {
+					...this.sheet,
+					visible: true,
+					title,
+					options,
+					field,
+					value: match ? match.value : ''
+				}
+			}
+			if (field === 'workshopId') {
+				const res = await workshopQueryApi({ pageIndex: 1, pageSize: 9999 })
+				const _data = res.data || {}
+				const list = _data.datas || (Array.isArray(_data) ? _data : [])
+				const opts = (list || []).map(it => ({
+					label: it.name,
+					value: it.id
+				}))
+				setSheet('生产厂', opts)
+			} else if (field === 'officeId') {
+				setSheet('科办', this.officeOptions)
+			} else if (field === 'customerType') {
+				const opts = this.customerTypeOptions || [];
+				setSheet('客户类型', opts)
+			} else if (field === 'productVarietyId') {
+				const opts = this.productVarietyIdOptions;
+				setSheet('产品品种', opts)
+			}
+		},
+		onSheetConfirm({
+			value,
+			label
+		}) {
+			const field = this.sheet.field
+			if (!field) return
+			this.form[field] = value || '';
+			this.form[field + 'Name'] = label || ''
+			this.sheet.visible = false
+		},
+		openRelate(fieldKey) {
+			let config = {};
+			switch (fieldKey) {
+				case 'customerId':
+					config = {
+						title: '客户名称',
+						source: 'customer',
+						rowKey: 'id',
+						multiple: false,
+						display: [{
+							label: '名称',
+							field: 'name'
+						},
+						{
+							label: '编号',
+							field: 'code'
+						},
+						{
+							label: '状态',
+							field: 'available',
+							format: v => (v ? '启用' : '停用')
+						}
+						]
+					}
+					break
+				case 'chargeUserId':
+					config = {
+						title: '责任人',
+						source: 'user',
+						rowKey: 'id',
+						multiple: false,
+						display: [{
+							label: '姓名',
+							field: 'name'
+						},
+						{
+							label: '编号',
+							field: 'code'
+						},
+						{
+							label: '状态',
+							field: 'available',
+							format: v => (v ? '启用' : '停用')
+						}
+						]
+					};
+					break
+			}
+			const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : [];
+			// 逐一赋值，避免整体替换对象导致子组件 prop 更新不及时
+			this.sheet.visible = false
+			this.relate.title = config.title
+			this.relate.source = config.source
+			this.relate.display = config.display
+			this.relate.multiple = config.multiple
+			this.relate.rowKey = config.rowKey
+			this.relate.selectedKeys = selectedKeys
+			this.relate.fieldKey = fieldKey;
+			// 最后再打开弹框，确保选中键已传入
+			this.$nextTick(() => {
+				this.relate.visible = true
+			})
+		},
+		onRelateConfirm({
+			items
+		}) {
+			console.log('onRelateConfirm__item', items)
+			const _fieldKey = this.relate.fieldKey;
+			console.log('onRelateConfirm__fieldKey', _fieldKey)
+			const first = (items && items.length > 0) ? items[0] : null
+			// 若无选中项，确认时清空之前的值
+			this.form[_fieldKey] = first.id || '';
+			this.form[_fieldKey + 'Name'] = first.name || '';
+		},
+		async loadCustomerTypeOptions() {
+			try {
+				const res = await getDicByCodeApi('ENTERPRISE_TYPE');
+				const list = res.data || [];
+				this.customerTypeOptions = (list || []).map(it => ({
+					label: it.name || '',
+					value: it.code || ''
+				}))
+			} catch (e) {
+				this.customerTypeOptions = []
+			}
+		},
+
+		async loadproductVarietyIdOptions() {
+			try {
+				const res = await productVarietyQueryApi({ pageIndex: 1, pageSize: 9999 })
+				const _data = res.data || {}
+				const list = _data.datas || (Array.isArray(_data) ? _data : [])
+				this.productVarietyIdOptions = (list || []).map(it => ({
+					label: it.name || it.text || it.label,
+					value: it.id || it.code || it.value
+				}))
+			} catch (e) {
+				this.productVarietyIdOptions = []
+			}
+		},
+		async onSubmit() {
+			// 必填校验
+			if (!this.validateRequired()) return
+			const payload = {
+				...this.form
 			}
+			delete payload.workshopIdName
+			delete payload.officeIdName
+			delete payload.customerTypeName
+			delete payload.customerIdName
+			delete payload.productVarietyIdName
+			delete payload.chargeUserIdName
+			createApi(payload).then(res => {
+				uni.showToast({
+					title: '提交成功',
+					icon: 'success'
+				})
+				setTimeout(() => { uni.redirectTo({ url: '/pages/dev_manage/index' }) }, 300)
+			}).catch(e => {
+				console.log('createApi__e', e)
+				uni.showToast({
+					title: e.msg || '提交失败',
+					icon: 'none'
+				})
+			})
 		}
 	}
+}
 </script>
 
 <style lang="scss" scoped>
-	.page {
-		display: flex;
-		flex-direction: column;
-		height: 100%;
+.page {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+}
+
+.scroll {
+	flex: 1;
+	padding: 12rpx 0 160rpx;
+}
+
+.footer {
+	position: fixed;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	padding: 32rpx;
+	padding-bottom: calc(32rpx + env(safe-area-inset-bottom));
+	background: #fff;
+	box-shadow: 0 -8rpx 24rpx rgba(0, 0, 0, 0.06);
+	z-index: 10;
+
+	.btn {
+		height: 80rpx;
+		line-height: 80rpx;
+		border-radius: 12rpx;
+		font-size: 32rpx;
 	}
 
-	.scroll {
-		flex: 1;
-		padding: 12rpx 0 160rpx;
+	.submit {
+		background: $theme-primary;
+		color: #fff;
 	}
+}
 
-	.footer {
-		position: fixed;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		padding: 32rpx;
-		padding-bottom: calc(32rpx + env(safe-area-inset-bottom));
-		background: #fff;
-		box-shadow: 0 -8rpx 24rpx rgba(0, 0, 0, 0.06);
-		z-index: 10;
+::v-deep .uni-list {
+	background: transparent;
 
-		.btn {
-			height: 80rpx;
-			line-height: 80rpx;
-			border-radius: 12rpx;
+	&-item {
+		&__extra-text {
 			font-size: 32rpx;
 		}
 
-		.submit {
-			background: $theme-primary;
-			color: #fff;
+		&__content-title {
+			font-size: 32rpx;
+			color: rgba(0, 0, 0, 0.9);
 		}
-	}
 
-	::v-deep .uni-list {
-		background: transparent;
-		&-item {
-			&__extra-text {
-				font-size: 32rpx;
-			}
-			&__content-title {
-				font-size: 32rpx;
-				color: rgba(0, 0, 0, 0.9);
-			}
+		&__container {
+			padding: 32rpx;
+
+			.uni-easyinput {
+				&__placeholder-class {
+					font-size: 32rpx;
+					color: rgba(0, 0, 0, 0.4);
+				}
 
-			&__container {
-				padding: 32rpx;
+				&__content {
+					border: none;
 
-				.uni-easyinput {
-					&__placeholder-class {
+					&-input {
+						padding-left: 0 !important;
+						height: 48rpx;
+						line-height: 48rpx;
 						font-size: 32rpx;
-						color: rgba(0, 0, 0, 0.4);
 					}
 
-					&__content {
-						border: none;
-
-						&-input {
-							padding-left: 0 !important;
-							height: 48rpx;
-							line-height: 48rpx;
-							font-size: 32rpx;
-						}
-
-						.content-clear-icon {
-							font-size: 44rpx !important;
-						}
+					.content-clear-icon {
+						font-size: 44rpx !important;
 					}
 				}
+			}
 
-				.item-title,
-				.uni-list-item__content {
-					flex: none;
-					min-height: 48rpx;
-					line-height: 48rpx;
-					font-size: 32rpx;
-					position: relative;
-					width: 210rpx;
-					margin-right: 32rpx;
-					color: rgba(0, 0, 0, 0.9);
+			.item-title,
+			.uni-list-item__content {
+				flex: none;
+				min-height: 48rpx;
+				line-height: 48rpx;
+				font-size: 32rpx;
+				position: relative;
+				width: 210rpx;
+				margin-right: 32rpx;
+				color: rgba(0, 0, 0, 0.9);
 
-					.required {
-						color: red;
-						position: absolute;
-						top: 50%;
-						transform: translateY(-50%);
-						left: -16rpx;
-					}
+				.required {
+					color: red;
+					position: absolute;
+					top: 50%;
+					transform: translateY(-50%);
+					left: -16rpx;
 				}
-
 			}
-			&.select-item {
-				&.is-empty {
-					.uni-list-item__extra-text {
-						color: rgba(0, 0, 0, 0.4) !important;
-					}
-				}
-				&.is-filled {
-					.uni-list-item__extra-text {
-						color: rgba(0, 0, 0, 0.9) !important;
-					}
+
+		}
+
+		&.select-item {
+			&.is-empty {
+				.uni-list-item__extra-text {
+					color: rgba(0, 0, 0, 0.4) !important;
 				}
 			}
-			&.mgb10 {
-				margin-bottom: 20rpx;
+
+			&.is-filled {
+				.uni-list-item__extra-text {
+					color: rgba(0, 0, 0, 0.9) !important;
+				}
 			}
 		}
-	}
 
+		&.mgb10 {
+			margin-bottom: 20rpx;
+		}
+	}
+}
 </style>
\ No newline at end of file

@@ -5,21 +5,27 @@
 				<view class="section">
 					<text class="row customer">{{ form.customer.name }}</text>
 					<view :class="['status', `status_${form.status}`]" />
-					<view class="row"><text class="label">生产厂</text><text class="value">{{ form.workshop ? form.workshop.name : '' }}</text>
+					<view class="row"><text class="label">生产厂</text><text class="value">{{ form.workshop ?
+						form.workshop.name : '' }}</text>
 					</view>
-					<view class="row"><text class="label">科办</text><text class="value">{{ form.office ? form.office.name : '' }}</text>
+					<view class="row"><text class="label">科办</text><text class="value">{{ form.office ? form.office.name
+						: '' }}</text>
 					</view>
-					<view class="row"><text class="label">客户类型</text><text
-							class="value">{{ getDicName('ENTERPRISE_TYPE', form.customerType, customerTypeOptions) }}</text>
+					<view class="row"><text class="label">客户类型</text><text class="value">{{
+						getDicName('ENTERPRISE_TYPE', form.customerType, customerTypeOptions) }}</text>
 					</view>
-					<view class="row"><text class="label">产品品种</text><text
-							class="value">{{ form.productVariety.name }}</text></view>
+					<view class="row"><text class="label">产品品种</text><text class="value">{{ form.productVariety.name
+					}}</text></view>
 					<view class="row"><text class="label">月用量</text><text class="value">{{ form.monthlyUsage }}</text>
 					</view>
 					<view class="row"><text class="label">目标量</text><text class="value">{{ form.targetQuantity }}</text>
 					</view>
+					<view class="row"><text class="label">订单吨位(kg)</text><text class="value">{{ form.orderQuantity }}</text>
+					</view>
+					<view class="row"><text class="label">发货吨位(kg)</text><text class="value">{{ form.shipmentQuantity }}</text>
+					</view>
 					<view class="row"><text class="label">行业</text><text class="value">{{ form.industry }}</text></view>
-					<view class="row"><text class="label">创建日期</text><text class="value">{{ form.createTime  }}</text>
+					<view class="row"><text class="label">创建日期</text><text class="value">{{ form.createTime }}</text>
 					</view>
 				</view>
 				<view class="section">
@@ -27,10 +33,10 @@
 					<view class="row"><text class="label">厚度</text><text class="value">{{ form.thickness }}</text>
 					</view>
 					<view class="row"><text class="label">宽度</text><text class="value">{{ form.width }}</text></view>
-					<view class="row"><text class="label">材质要求</text><text
-							class="value">{{ form.materialRequire }}</text></view>
-					<view class="row"><text class="label">品质要求</text><text
-							class="value">{{ form.qualityRequire }}</text></view>
+					<view class="row"><text class="label">材质要求</text><text class="value">{{ form.materialRequire
+					}}</text></view>
+					<view class="row"><text class="label">品质要求</text><text class="value">{{ form.qualityRequire
+					}}</text></view>
 					<view class="row"><text class="label">同行</text><text class="value">{{ form.peer }}</text></view>
 				</view>
 				<view class="section">
@@ -43,271 +49,292 @@
 					<view class="row"><text class="label">责任人</text><text class="value">{{ form.chargeUserName }}</text>
 					</view>
 				</view>
+				<VisitList mode="view" :list="form.visitRecords || []" />
 			</view>
 		</scroll-view>
-        <detail-buttons :buttons="displayButtons" @click="handleButtonClick" />
+		<detail-buttons :buttons="displayButtons" @click="handleButtonClick" />
 	</view>
 </template>
 
 <script>
-  import {
-    getDetailApi,
-    cancelApi
-  } from '@/api/devManage.js'
-	import {
-		getDicName
-	} from '@/utils/dic.js'
-	import {
-		getDicByCodeApi
-	} from '@/api/base.js'
-	import DetailButtons from '@/components/detail-buttons/index.vue'
+import {
+	getDetailApi,
+	cancelApi
+} from '@/api/devManage.js'
+import {
+	getDicName
+} from '@/utils/dic.js'
+import {
+	getDicByCodeApi
+} from '@/api/base.js'
+import DetailButtons from '@/components/detail-buttons/index.vue'
+import VisitList from './visitList.vue'
 
-	export default {
-		name: 'DevManageDetail',
-		components: {
-			DetailButtons
+
+export default {
+	name: 'DevManageDetail',
+	components: {
+		DetailButtons,
+		VisitList
+	},
+	data() {
+		return {
+			form: {
+				workshop: {},
+				office: {},
+				customer: {},
+				customerType: '',
+				chargeUserId: '',
+				chargeUserIdName: '',
+				productVariety: {},
+				monthlyUsage: '',
+				targetQuantity: '',
+				orderQuantity: '',
+				shipmentQuantity: '',
+				industry: '',
+				mark: '',
+				thickness: '',
+				width: '',
+				materialRequire: '',
+				qualityRequire: '',
+				peer: '',
+				pricingMode: '',
+				settleDays: '',
+				createTime: '',
+				status: ''
+			},
+			customerTypeOptions: [],
+			todoType: '',
+			buttons: [{
+				text: '编辑',
+				visible: true,
+				variant: 'outline',
+				event: 'edit',
+			},
+			{
+				text: '审核详情',
+				visible: true,
+				variant: 'outline',
+				event: 'auditDetail'
+			},
+			{
+				text: '审核',
+				visible: true,
+				variant: 'primary',
+				event: 'audit'
+			},
+			{
+				text: '拜访记录',
+				visible: true,
+				variant: 'primary',
+				event: 'visitAdd',
+			},
+			{
+				text: '取消',
+				visible: true,
+				variant: 'outline',
+				event: 'cancel',
+				style: {
+					color: 'rgba(0,0,0,0.9)',
+					border: '1px solid #DCDCDC'
+				}
+			}
+			],
+		}
+	},
+	computed: {
+		displayButtons() {
+			const s = Number(this.form && this.form.status || 0)
+			const t = this.todoType || '';
+			return [
+				{ ...this.buttons[0], visible: (s === 3 && t === '' && this.$auth.hasPermi('customer-dev-manage:customer-dev-plan:modify')) },
+				{ ...this.buttons[1], visible: this.$auth.hasPermi('customer-dev-manage:customer-dev-plan:reviewDetail') },
+				{ ...this.buttons[2], visible: (s === 1 && t === 'WAIT' && this.$auth.hasPermi('customer-dev-manage:customer-dev-plan:review')) },
+				{ ...this.buttons[3], visible: (s === 2 && t === '' && this.$auth.hasPermi('customer-dev-manage:customer-dev-plan:record')) },
+				{ ...this.buttons[4], visible: (s === 3 && t === '' && this.$auth.hasPermi('customer-dev-manage:customer-dev-plan:close')) }
+			]
+		}
+	},
+	created() {
+		this.loadCustomerTypeOptions()
+	},
+	onShow() {
+		uni.$on('dev_manage_detail_reload', this.onReload)
+	},
+	onUnload() {
+		uni.$off('dev_manage_detail_reload', this.onReload)
+	},
+	onLoad(query) {
+		const id = (query && (query.id || query.code)) || ''
+		const t = (query && (query.todoType)) || ''
+		this.todoType = t
+		if (id) this.loadDetail(id)
+	},
+	methods: {
+		onReload(payload) {
+			const id = (payload && (payload.id || payload.code)) || this.form.id || this.form.code || ''
+			if (id) this.loadDetail(id)
 		},
-      data() {
-        return {
-          form: {
-			workshop: {},
-			office: {},
-			customer: {},
-			customerType: '',
-			chargeUserId: '',
-			chargeUserIdName: '',
-			productVariety: {},
-			monthlyUsage: '',
-			targetQuantity: '',
-			industry: '',
-			mark: '',
-			thickness: '',
-			width: '',
-			materialRequire: '',
-			qualityRequire: '',
-			peer: '',
-			pricingMode: '',
-			settleDays: '',
-			createTime: '',
-            status: ''
-          },
-          customerTypeOptions: [],
-          todoType: '',
-          buttons: [{
-            text: '编辑',
-            visible: true,
-            variant: 'outline',
-            event: 'edit',
-          },
-          {
-            text: '审核详情',
-            visible: true,
-            variant: 'outline',
-            event: 'auditDetail'
-          },
-          {
-            text: '审核',
-            visible: true,
-            variant: 'primary',
-            event: 'audit'
-          },
-          {
-            text: '取消',
-            visible: true,
-            variant: 'outline',
-            event: 'cancel',
-			style: {
-              color: 'rgba(0,0,0,0.9)',
-			  border: '1px solid #DCDCDC'
-            }
-          }
-        ],
-      }
-    },
-    computed: {
-      displayButtons() {
-        const s = Number(this.form && this.form.status || 0)
-        const t = this.todoType || ''
-        return [
-          { ...this.buttons[0], visible: (s === 3 && t === '') },
-          { ...this.buttons[1] },
-          { ...this.buttons[2], visible: (s === 1 && t === 'WAIT') },
-          { ...this.buttons[3], visible: (s === 3 && t === '') }
-        ]
-      }
-    },
-		created() {
-			this.loadCustomerTypeOptions()
+		async loadDetail(id) {
+			try {
+				const res = await getDetailApi(id)
+				console.log('getDetailApi res', res)
+				const data = res.data || {};
+				this.form = {
+					...data
+				}
+			} catch (e) {
+				console.error('loadDetail error', e)
+			}
 		},
-		onShow() {
-			uni.$on('dev_manage_detail_reload', this.onReload)
+		async loadCustomerTypeOptions() {
+			try {
+				const res = await getDicByCodeApi('ENTERPRISE_TYPE')
+				const list = res.data || []
+				this.customerTypeOptions = Array.isArray(list) ? list : []
+			} catch (e) {
+				this.customerTypeOptions = []
+			}
 		},
-		onUnload() {
-			uni.$off('dev_manage_detail_reload', this.onReload)
+		getDicName: getDicName,
+		handleButtonClick(btn) {
+			if (!btn || btn.disabled) return
+			if (typeof btn.onClick === 'function') return btn.onClick(this.form, btn.params)
+			const e = btn.event || ''
+			if (e === 'edit') return this.onEdit(btn && btn.params)
+			if (e === 'auditDetail') return this.onAuditDetail(btn && btn.params)
+			if (e === 'audit') return this.onAudit(btn && btn.params)
+			if (e === 'cancel') return this.onCancel(btn && btn.params)
+			if (e === 'visitAdd') return this.onVisitAdd(btn && btn.params)
 		},
-    onLoad(query) {
-      const id = (query && (query.id || query.code)) || ''
-      const t = (query && (query.todoType)) || ''
-      this.todoType = t
-      if (id) this.loadDetail(id)
-    },
-		methods: {
-			onReload(payload) {
-				const id = (payload && (payload.id || payload.code)) || this.form.id || this.form.code || ''
-				if (id) this.loadDetail(id)
-			},
-			async loadDetail(id) {
-				try {
-					const res = await getDetailApi(id)
-					console.log('getDetailApi res', res)
-					const data = res.data || {};
-					this.form = {
-						...data
+		onEdit() {
+			const id = this.form.id || this.form.code || ''
+			const query = id ? ('?id=' + encodeURIComponent(id)) : ''
+			uni.navigateTo({
+				url: '/pages/dev_manage/modify' + query
+			})
+		},
+		onAuditDetail() {
+			const CACHE_KEY = 'sourceBusinessId';
+			uni.setStorageSync(CACHE_KEY, this.form.id)
+			uni.navigateTo({ url: '/pages/flow/audit_detail' })
+		},
+		onAudit() {
+			const CACHE_KEY = 'sourceBusinessId';
+			uni.setStorageSync(CACHE_KEY, this.form.id);
+			uni.navigateTo({ url: '/pages/flow/audit' })
+		},
+		onCancel() {
+			const id = this.form && (this.form.id || this.form.code) || ''
+			if (!id) return
+			uni.showModal({
+				title: '系统提示',
+				content: '是否确定取消该流程？',
+				confirmText: '确定',
+				cancelText: '取消',
+				success: (res) => {
+					if (res && res.confirm) {
+						cancelApi(id).then(() => {
+							uni.showToast({ title: '已取消', icon: 'none' })
+							setTimeout(() => {
+								uni.redirectTo({ url: '/pages/dev_manage/index' })
+							}, 300)
+						}).catch(() => {
+							uni.showToast({ title: '取消失败', icon: 'none' })
+						})
 					}
-				} catch (e) {
-					console.error('loadDetail error', e)
 				}
-			},
-			async loadCustomerTypeOptions() {
-				try {
-					const res = await getDicByCodeApi('ENTERPRISE_TYPE')
-					const list = res.data || []
-					this.customerTypeOptions = Array.isArray(list) ? list : []
-				} catch (e) {
-					this.customerTypeOptions = []
-				}
-			},
-			getDicName: getDicName,
-			handleButtonClick(btn) {
-				if (!btn || btn.disabled) return
-				if (typeof btn.onClick === 'function') return btn.onClick(this.form, btn.params)
-				const e = btn.event || ''
-				if (e === 'edit') return this.onEdit(btn && btn.params)
-				if (e === 'auditDetail') return this.onAuditDetail(btn && btn.params)
-				if (e === 'audit') return this.onAudit(btn && btn.params)
-				if (e === 'cancel') return this.onCancel(btn && btn.params)
-			},
-			onEdit() {
-				const id = this.form.id || this.form.code || ''
-				const query = id ? ('?id=' + encodeURIComponent(id)) : ''
-				uni.navigateTo({
-					url: '/pages/dev_manage/modify' + query
-				})
-			},
-			onAuditDetail() {
-				const CACHE_KEY = 'sourceBusinessId';
-				uni.setStorageSync(CACHE_KEY, this.form.id)
-				uni.navigateTo({ url: '/pages/flow/audit_detail' })
-			},
-			onAudit() {
-				const CACHE_KEY = 'sourceBusinessId';
-				uni.setStorageSync(CACHE_KEY, this.form.id);
-				uni.navigateTo({ url: '/pages/flow/audit' })
-			},
-      onCancel() {
-        const id = this.form && (this.form.id || this.form.code) || ''
-        if (!id) return
-        uni.showModal({
-          title: '系统提示',
-          content: '是否确定取消该流程？',
-          confirmText: '确定',
-          cancelText: '取消',
-          success: (res) => {
-            if (res && res.confirm) {
-              cancelApi(id).then(() => {
-                uni.showToast({ title: '已取消', icon: 'none' })
-                setTimeout(() => {
-                  uni.redirectTo({ url: '/pages/dev_manage/index' })
-                }, 300)
-              }).catch(() => {
-                uni.showToast({ title: '取消失败', icon: 'none' })
-              })
-            }
-          }
-        })
-      }
+			})
+		},
+		onVisitAdd() {
+			console.log('onVisitAdd', this.form)
+			const id = this.form && (this.form.id || this.form.code) || ''
+			if (!id) return
+			const query = id ? ('?id=' + encodeURIComponent(id)) : ''
+			uni.navigateTo({ url: '/pages/dev_manage/visit_add' + query })
 		}
 	}
+}
 </script>
 
 <style lang="scss" scoped>
-	.page {
-		display: flex;
-		flex-direction: column;
-		height: 100%;
-	}
-
-	.scroll {
-		flex: 1;
-		padding: 8rpx 0 144rpx 0;
-	}
+.page {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+}
 
-	.detail-page {
-		background: #f3f3f3;
-	}
+.scroll {
+	flex: 1;
+	padding: 8rpx 0 144rpx 0;
+}
 
-	.section {
-		padding: 32rpx;
-		background: #fff;
-		margin-bottom: 20rpx;
-		position: relative;
+.detail-page {
+	background: #f3f3f3;
+}
 
-		.status {
-			position: absolute;
-			top: 16rpx;
-			right: 52rpx;
-			width: 180rpx;
-			height: 146rpx;
-			background-repeat: no-repeat;
-			background-size: 100% 100%;
-			background-position: center;
+.section {
+	padding: 32rpx;
+	background: #fff;
+	margin-bottom: 20rpx;
+	position: relative;
 
-			&_1 {
-				background-image: url('~@/static/images/dev_manage/status_1.png');
-			}
+	.status {
+		position: absolute;
+		top: 16rpx;
+		right: 52rpx;
+		width: 180rpx;
+		height: 146rpx;
+		background-repeat: no-repeat;
+		background-size: 100% 100%;
+		background-position: center;
 
-			&_2 {
-				background-image: url('~@/static/images/dev_manage/status_2.png');
-			}
+		&_1 {
+			background-image: url('~@/static/images/dev_manage/status_1.png');
+		}
 
-			&_3 {
-				background-image: url('~@/static/images/dev_manage/status_3.png');
-			}
+		&_2 {
+			background-image: url('~@/static/images/dev_manage/status_2.png');
+		}
 
-			&_4 {
-				background-image: url('~@/static/images/dev_manage/status_4.png');
-			}
+		&_3 {
+			background-image: url('~@/static/images/dev_manage/status_3.png');
+		}
 
+		&_4 {
+			background-image: url('~@/static/images/dev_manage/status_4.png');
 		}
 
-		.row {
-			display: flex;
-			margin-bottom: 28rpx;
+	}
 
-			&:last-child {
-				margin-bottom: 0;
-			}
+	.row {
+		display: flex;
+		margin-bottom: 28rpx;
 
-			&.customer {
-				font-size: 36rpx;
-				font-weight: 600;
-				color: rgba(0, 0, 0, 0.9);
-			}
+		&:last-child {
+			margin-bottom: 0;
+		}
 
-			.label {
-				width: 120rpx;
-				line-height: 32rpx;
-				font-size: 28rpx;
-				color: rgba(0, 0, 0, 0.6);
-			}
+		&.customer {
+			font-size: 36rpx;
+			font-weight: 600;
+			color: rgba(0, 0, 0, 0.9);
+		}
 
-			.value {
-				flex: 1;
-				line-height: 32rpx;
-				font-size: 28rpx;
-				color: rgba(0, 0, 0, 0.9);
-				text-align: right;
-			}
+		.label {
+			max-width: 300rpx;
+			line-height: 32rpx;
+			font-size: 28rpx;
+			color: rgba(0, 0, 0, 0.6);
+		}
+
+		.value {
+			flex: 1;
+			line-height: 32rpx;
+			font-size: 28rpx;
+			color: rgba(0, 0, 0, 0.9);
+			text-align: right;
 		}
 	}
-</style>
\ No newline at end of file
+}
+</style>

@@ -5,13 +5,14 @@
 				<uni-search-bar v-model="searchKeyword" radius="6" placeholder="请输入客户名称" clearButton="auto"
 					cancelButton="none" bgColor="#F3F3F3" textColor="rgba(0,0,0,0.4)" @confirm="search"
 					@input="onSearchInput" />
-				<view class="tool-icons">
-					<image class="tool-icon"
-						:src="batchMode ? '/static/images/dev_manage/close_icon.png' : '/static/images/dev_manage/batch_icon.png'"
-						@click="toggleBatch" />
-					<image class="tool-icon" src="/static/images/dev_manage/add_icon.png" @click="onAdd" />
-					<image class="tool-icon" src="/static/images/dev_manage/filter_icon.png" @click="openFilter" />
-				</view>
+                <view class="tool-icons">
+                    <image class="tool-icon"
+                      	v-if="$auth.hasPermi('customer-dev-manage:customer-dev-plan:batchReview')"
+                        :src="batchMode ? '/static/images/dev_manage/close_icon.png' : '/static/images/dev_manage/batch_icon.png'"
+                        @click="toggleBatch" />
+                    <image v-if="$auth.hasPermi('customer-dev-manage:customer-dev-plan:add')" class="tool-icon" src="/static/images/dev_manage/add_icon.png" @click="onAdd" />
+                    <image class="tool-icon" src="/static/images/dev_manage/filter_icon.png" @click="openFilter" />
+                </view>
 			</view>
 
 			<!-- 页内 tabs -->
@@ -355,11 +356,11 @@
 					})
 				})
 			},
-			onAdd() {
-				uni.navigateTo({
-					url: '/pages/dev_manage/add'
-				})
-			},
+            onAdd() {
+                uni.navigateTo({
+                    url: '/pages/dev_manage/add'
+                })
+            },
 			// 列表接口（真实请求）
 			fetchList({
 				pageIndex,
@@ -811,4 +812,4 @@
 			}
 		}
 	}
-</style>
\ No newline at end of file
+</style>

+<template>
+    <view class="product" :class="{ 'history': mode == 'history' }">
+
+        <!-- 详情-拜访记录 -->
+        <view class="header bp">
+            <image class="opCollapse" src="/static/images/title.png" />
+            <text class="title">拜访记录</text>
+            <view class="ops">
+                <view v-if="mode === 'view'" class="op1" @click="toggleViewCollapse">
+                    <image class="opAdd" :src="collapsedView ? '/static/images/down.png' : '/static/images/up.png'" />
+                    <text class="op">{{ collapsedView ? '展开' : '收起' }} </text>
+                </view>
+
+            </view>
+        </view>
+        <view v-if="mode === 'view'" class="view-list" v-show="!collapsedView">
+            <view v-for="(item, idx) in items" :key="'v-' + idx" class="card">
+                <view class="row"><text class="label">拜访人姓名</text><text class="value">{{ item.userName }}</text></view>
+                <view class="row"><text class="label">拜访时间</text><text class="value">{{ item.visitTime }}</text></view>
+                <view class="row"><text class="label">拜访内容</text><text class="value">{{ item.visitContent }}</text></view>
+            </view>
+        </view>
+
+    </view>
+</template>
+<script>
+import { uuid } from '@/utils/uuid.js'
+export default {
+    name: 'VisitList',
+    props: {
+        title: { type: String, default: '' },
+        mode: { type: String, default: 'add' },
+        list: { type: Array, default: () => [] },
+    },
+    data() {
+        return {
+            items: [],
+            collapsedView: false,
+        }
+    },
+    watch: {
+        items: {
+            handler() { this.emitChange() },
+            deep: true
+        },
+        list: {
+            handler(v) {
+                const arr = Array.isArray(v) ? v : []
+                this.items = arr.map(x => {
+                    const it = { ...this.defaultItem(), ...x, collapsed: true }
+                    return it
+                })
+            },
+            deep: true
+        },
+    },
+    created() {
+        const init = Array.isArray(this.list) && this.list.length > 0 ? this.list.map(v => ({ ...this.defaultItem(), ...v, collapsed: false })) : [{ ...this.defaultItem(), collapsed: false }]
+        this.items = init
+    },
+    methods: {
+        defaultItem() {
+            return { collapsed: false, packagingFee: '' }
+        },
+        toggleItem(idx) {
+            const it = this.items[idx]
+            if (!it) return
+            it.collapsed = !it.collapsed
+            this.$set(this.items, idx, it)
+        },
+        emitChange() {
+            console.log('emitChange__items', this.items)
+            const out = this.items.map(it => JSON.parse(JSON.stringify(it)))
+            console.log('emitChange__out', out)
+            this.$emit('input', out)
+            this.$emit('update:value', out)
+            this.$emit('change', out)
+        },
+        toggleViewCollapse() {
+            this.collapsedView = !this.collapsedView
+        },
+    }
+}
+</script>
+<style lang="scss" scoped>
+.header {
+    background-color: #fff;
+    display: flex;
+    align-items: center;
+    padding: 24rpx 32rpx;
+
+    &.bp {
+        border-bottom: 1px solid #f0f0f0;
+    }
+}
+
+.dot {
+    width: 16rpx;
+    height: 16rpx;
+    background: #3D48A3;
+    border-radius: 50%;
+    margin-right: 12rpx;
+}
+
+.title {
+    font-size: 32rpx;
+    color: rgba(0, 0, 0, 0.9);
+    font-weight: 600;
+}
+
+.ops {
+    margin-left: auto;
+}
+
+.op {
+    color: $theme-primary;
+    font-size: 28rpx;
+    margin-left: 8rpx;
+}
+
+.op1 {
+    display: flex;
+    align-items: center;
+}
+
+.opAdd {
+    color: rgba(0, 0, 0, 0.6);
+    width: 40rpx;
+    height: 40rpx;
+}
+
+.opCollapse {
+    color: rgba(0, 0, 0, 0.6);
+    width: 32rpx;
+    height: 28rpx;
+    margin-right: 16rpx;
+}
+
+
+::v-deep .uni-list {
+    background: transparent;
+
+    &-item {
+        &__extra-text {
+            font-size: 32rpx;
+        }
+
+        &__content-title {
+            font-size: 32rpx;
+            color: rgba(0, 0, 0, 0.9);
+        }
+
+        &__container {
+            padding: 32rpx;
+
+            .uni-easyinput {
+
+                .is-disabled {
+                    background-color: transparent !important;
+                }
+
+                &__placeholder-class {
+                    font-size: 32rpx;
+                    color: rgba(0, 0, 0, 0.4);
+                }
+
+                &__content {
+                    border: none;
+
+                    &-input {
+                        padding-left: 0 !important;
+                        height: 48rpx;
+                        line-height: 48rpx;
+                        font-size: 32rpx;
+                    }
+
+                    .content-clear-icon {
+                        font-size: 44rpx !important;
+                    }
+                }
+            }
+
+            .amount-row {
+                flex: 1;
+                display: flex;
+                align-items: center;
+
+                .uni-easyinput {
+                    flex: 1;
+                }
+
+                .unit {
+                    margin-left: 16rpx;
+                    color: rgba(0, 0, 0, 0.9);
+                }
+            }
+
+            .item-title,
+            .uni-list-item__content {
+                flex: none;
+                min-height: 48rpx;
+                line-height: 48rpx;
+                font-size: 32rpx;
+                position: relative;
+                width: 210rpx;
+                margin-right: 32rpx;
+                color: rgba(0, 0, 0, 0.9);
+                padding-right: 0;
+
+
+                .required {
+                    color: red;
+                    position: absolute;
+                    top: 50%;
+                    transform: translateY(-50%);
+                    left: -16rpx;
+                }
+            }
+
+        }
+
+        &.select-item {
+            &.is-empty {
+                .uni-list-item__extra-text {
+                    color: rgba(0, 0, 0, 0.4) !important;
+                }
+            }
+
+            &.is-filled {
+                .uni-list-item__extra-text {
+                    color: rgba(0, 0, 0, 0.9) !important;
+                }
+            }
+
+            .serial-number-row {
+                display: flex;
+                align-items: center;
+            }
+
+        }
+
+        &.mgb10 {
+            margin-bottom: 20rpx;
+        }
+
+    }
+
+    .title-header {
+        background-color: #fff;
+        display: flex;
+        align-items: center;
+        padding: 32rpx 32rpx 22rpx;
+
+        &_icon {
+            width: 32rpx;
+            height: 28rpx;
+            margin-right: 16rpx;
+        }
+
+        span {
+            color: rgba(0, 0, 0, 0.9);
+            font-size: 32rpx;
+            line-height: 44rpx;
+            font-weight: 600;
+        }
+    }
+}
+
+/* 只读 easyinput 根据内容自适应高度 */
+::v-deep .uni-list-item__container {
+    align-items: flex-start;
+}
+
+.block-ops {
+    display: flex;
+    padding: 20rpx 32rpx 20rpx;
+    justify-content: space-around;
+}
+
+.del {
+    color: #D54941;
+    font-size: 28rpx;
+    display: flex;
+    align-items: center;
+
+    image {
+        width: 40rpx;
+        height: 40rpx;
+    }
+}
+
+.toggle {
+    color: $theme-primary;
+    font-size: 28rpx;
+    display: flex;
+    align-items: center;
+
+    image {
+        width: 40rpx;
+        height: 40rpx;
+    }
+}
+
+.section {
+    background: #f1f1f1;
+    margin-bottom: 20rpx;
+
+    .block {
+        background: #ffffff;
+        padding: 32rpx 0;
+        margin-bottom: 20rpx;
+
+        &:last-child {
+            margin-bottom: 0;
+        }
+    }
+
+    .row {
+        display: flex;
+        // margin-bottom: 24rpx;
+        line-height: 32rpx;
+        padding: 32rpx;
+        border-bottom: 1rpx solid #f2f2f2;
+
+
+        &.noneStyle {
+            border-bottom: 0;
+            border-bottom: none;
+        }
+
+        &.row-spec {
+            align-items: center;
+        }
+    }
+
+    .row:last-child {
+        margin-bottom: 0;
+    }
+
+    .label {
+        width: 210rpx;
+        margin-right: 32rpx;
+        color: rgba(0, 0, 0, 0.9);
+        font-size: 32rpx;
+        line-height: 48rpx;
+    }
+
+    .value {
+        flex: 1;
+        color: rgba(0, 0, 0, 0.9);
+        font-size: 32rpx;
+        white-space: pre-wrap;
+        word-break: break-all;
+        line-height: 48rpx;
+    }
+
+    .value-spec {
+        height: 48rpx;
+        display: flex;
+        align-items: center;
+        color: #000000;
+
+        &_box {
+            position: relative;
+            width: 60rpx;
+            height: 48rpx;
+
+            &_1 {
+                font-size: 16rpx;
+                position: absolute;
+                top: -10rpx;
+                left: 0;
+            }
+
+            &_2 {
+                font-size: 16rpx;
+                position: absolute;
+                bottom: -10rpx;
+                left: 0;
+            }
+        }
+
+        &_val {
+            font-size: 28rpx;
+
+            &.p12 {
+                padding-right: 12rpx;
+            }
+        }
+    }
+
+    .view-total {
+        padding-top: 20rpx;
+
+        .head {
+            font-size: 32rpx;
+            font-weight: 600;
+            line-height: 50rpx;
+            color: rgba(0, 0, 0, 0.9);
+            padding-bottom: 16rpx;
+            margin-bottom: 24rpx;
+            ;
+            border-bottom: 1px dashed #E7E7E7;
+        }
+
+        .row {
+            display: flex;
+            margin-bottom: 24rpx;
+            line-height: 32rpx;
+
+            .label {
+                width: 180rpx;
+                margin-right: 14rpx;
+                color: rgba(0, 0, 0, 0.6);
+                font-size: 28rpx;
+            }
+
+            .value {
+                flex: 1;
+                color: rgba(0, 0, 0, 0.9);
+                font-size: 28rpx;
+                white-space: pre-wrap;
+                word-break: break-all;
+            }
+        }
+    }
+}
+
+.view-list {
+    padding: 26rpx 32rpx;
+    background: #ffffff;
+
+    .card {
+        background: #f3f3f3;
+        border-radius: 16rpx;
+        padding: 32rpx 44rpx;
+        margin-bottom: 20rpx;
+
+        &:last-child {
+            margin-bottom: 0;
+        }
+    }
+
+    .row {
+        display: flex;
+        margin-bottom: 24rpx;
+        line-height: 32rpx;
+
+        &.row-spec {
+            height: 60rpx;
+            align-items: center;
+        }
+    }
+
+    .row:last-child {
+        margin-bottom: 0;
+    }
+
+    .label {
+        width: 140rpx;
+        margin-right: 14rpx;
+        color: rgba(0, 0, 0, 0.6);
+        font-size: 28rpx;
+    }
+
+    .value {
+        flex: 1;
+        color: rgba(0, 0, 0, 0.9);
+        font-size: 28rpx;
+        white-space: pre-wrap;
+        word-break: break-all;
+    }
+
+    .value-spec {
+        height: 60rpx;
+        display: flex;
+        align-items: center;
+        color: #000000;
+
+        &_box {
+            position: relative;
+            width: 60rpx;
+            height: 60rpx;
+
+            &_1 {
+                font-size: 16rpx;
+                position: absolute;
+                top: 0;
+                left: 0;
+            }
+
+            &_2 {
+                font-size: 16rpx;
+                position: absolute;
+                bottom: 0;
+                left: 0;
+            }
+        }
+
+        &_val {
+            font-size: 28rpx;
+
+            &.p12 {
+                padding-right: 12rpx;
+            }
+        }
+    }
+
+    .view-total {
+        padding-top: 20rpx;
+
+        .head {
+            font-size: 32rpx;
+            font-weight: 600;
+            line-height: 50rpx;
+            color: rgba(0, 0, 0, 0.9);
+            padding-bottom: 16rpx;
+            margin-bottom: 24rpx;
+            ;
+            border-bottom: 1px dashed #E7E7E7;
+        }
+
+        .row {
+            display: flex;
+            margin-bottom: 24rpx;
+            line-height: 32rpx;
+
+            .label {
+                width: 180rpx;
+                margin-right: 14rpx;
+                color: rgba(0, 0, 0, 0.6);
+                font-size: 28rpx;
+            }
+
+            .value {
+                flex: 1;
+                color: rgba(0, 0, 0, 0.9);
+                font-size: 28rpx;
+                white-space: pre-wrap;
+                word-break: break-all;
+            }
+        }
+    }
+}
+</style>

+<template>
+  <view class="page">
+    <scroll-view class="scroll" scroll-y>
+      <uni-list>
+        <uni-list-item class="select-item" :class="form.userId ? 'is-filled' : 'is-empty'" clickable
+          @click="openRelate('userId')" :rightText="form.userName || '请选择拜访人'" showArrow>
+          <template v-slot:body>
+            <view class="item-title"><text class="required">*</text><text>拜访人姓名</text></view>
+          </template>
+        </uni-list-item>
+
+        <uni-list-item>
+          <template v-slot:body>
+            <view class="item-title"><text class="required">*</text><text>拜访时间</text></view>
+          </template>
+          <template v-slot:footer>
+            <uni-datetime-picker type="date" v-model="form.visitTime" />
+          </template>
+        </uni-list-item>
+
+        <uni-list-item title="拜访内容">
+          <template v-slot:footer>
+            <uni-easyinput type="textarea" v-model="form.visitContent" placeholder="请输入拜访内容" :inputBorder="false" />
+          </template>
+        </uni-list-item>
+      </uni-list>
+    </scroll-view>
+
+    <view class="footer">
+      <button class="btn submit" type="primary" @click="onSubmit">提交</button>
+    </view>
+
+    <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source"
+      :display-fields="relate.display" :multiple="relate.multiple" :row-key="relate.rowKey"
+      :selectedKeys.sync="relate.selectedKeys" :source-extra="{ source: 'CUSTOMER_DEVELOP' }"
+      @confirm="onRelateConfirm" />
+  </view>
+</template>
+
+<script>
+import RelateSelectSheet from '@/components/relate-select/index.vue'
+import storage from '@/utils/storage'
+import constant from '@/utils/constant'
+import {
+  createVisitRecordApi
+} from '@/api/devManage.js'
+
+export default {
+  name: 'DevManageVisitAdd',
+  components: { RelateSelectSheet },
+  data() {
+    return {
+      customerId: '',
+      form: {
+        userId: '',
+        userName: '',
+        visitTime: new Date().toISOString().substring(0, 10),
+        visitContent: ''
+      },
+      relate: { visible: false, title: '选择拜访人', source: '', display: [], multiple: false, rowKey: 'id', selectedKeys: [], fieldKey: '' }
+    }
+  },
+  created() {
+    const user = storage.get(constant.name)
+    const userId = storage.get(constant.id)
+    this.form.userName = user || ''
+    this.form.userId = userId || ''
+  },
+  onLoad(query) {
+    this.customerId = (query && query.id) || '';
+  },
+  methods: {
+    openRelate(fieldKey) {
+      let config = {}
+      if (fieldKey === 'userId') {
+        config = {
+          title: '拜访人',
+          source: 'user',
+          rowKey: 'id',
+          multiple: false,
+          display: [
+            { label: '姓名', field: 'name' },
+            { label: '编号', field: 'code' },
+            { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }
+          ]
+        }
+      }
+      const selectedKeys = this.form.userId ? [this.form.userId] : []
+      this.relate.title = config.title
+      this.relate.source = config.source
+      this.relate.display = config.display
+      this.relate.multiple = config.multiple
+      this.relate.rowKey = config.rowKey
+      this.relate.selectedKeys = selectedKeys
+      this.relate.fieldKey = fieldKey
+      this.$nextTick(() => { this.relate.visible = true })
+    },
+    onRelateConfirm({ items }) {
+      const first = (items && items.length > 0) ? items[0] : null
+      this.form.userId = (first && (first.id || first.userId)) || ''
+      this.form.userName = (first && (first.name || first.userName)) || ''
+    },
+    validateRequired() {
+      const checks = [
+        { key: 'userId', label: '拜访人姓名' },
+        { key: 'visitTime', label: '拜访时间' }
+      ]
+      for (const it of checks) {
+        const val = this.form[it.key]
+        if (val === undefined || val === null || String(val).trim() === '') {
+          uni.showToast({
+            title: `请先选择${it.label}`,
+            icon: 'none'
+          })
+          return false
+        }
+      }
+      return true
+    },
+    onSubmit() {
+      if (!this.validateRequired()) return
+      const payload = { ...this.form }
+      payload.customerId = this.customerId;
+      delete payload.userName;
+      console.log('visit_add_submit', payload)
+      createVisitRecordApi(payload).then(res => {
+        uni.showToast({
+          title: '提交成功',
+          icon: 'success'
+        })
+        setTimeout(() => { uni.redirectTo({ url: '/pages/dev_manage/index' }) }, 300)
+      }).catch(e => {
+        uni.showToast({
+          title: e.msg || '提交失败',
+          icon: 'none'
+        })
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.page {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+}
+
+.scroll {
+  flex: 1;
+  padding: 12rpx 0 160rpx;
+}
+
+.footer {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  padding: 32rpx;
+  padding-bottom: calc(32rpx + env(safe-area-inset-bottom));
+  background: #fff;
+  box-shadow: 0 -8rpx 24rpx rgba(0, 0, 0, 0.06);
+  z-index: 10;
+
+  .btn {
+    height: 80rpx;
+    line-height: 80rpx;
+    border-radius: 12rpx;
+    font-size: 32rpx;
+  }
+
+  .submit {
+    background: $theme-primary;
+    color: #fff;
+  }
+}
+
+::v-deep .uni-list {
+  background: transparent;
+
+  &-item {
+    &__extra-text {
+      font-size: 32rpx;
+    }
+
+    &__content-title {
+      font-size: 32rpx;
+      color: rgba(0, 0, 0, 0.9);
+    }
+
+    &__container {
+      padding: 32rpx;
+
+      .uni-easyinput {
+        &__placeholder-class {
+          font-size: 32rpx;
+          color: rgba(0, 0, 0, 0.4);
+        }
+
+        &__content {
+          border: none;
+
+          &-input {
+            padding-left: 0 !important;
+            height: 48rpx;
+            line-height: 48rpx;
+            font-size: 32rpx;
+          }
+
+          .content-clear-icon {
+            font-size: 44rpx !important;
+          }
+        }
+      }
+
+      .item-title,
+      .uni-list-item__content {
+        flex: none;
+        min-height: 48rpx;
+        line-height: 48rpx;
+        font-size: 32rpx;
+        position: relative;
+        width: 210rpx;
+        margin-right: 32rpx;
+        color: rgba(0, 0, 0, 0.9);
+
+        .required {
+          color: red;
+          position: absolute;
+          top: 50%;
+          transform: translateY(-50%);
+          left: -16rpx;
+        }
+      }
+
+    }
+
+    &.select-item {
+      &.is-empty {
+        .uni-list-item__extra-text {
+          color: rgba(0, 0, 0, 0.4) !important;
+        }
+      }
+
+      &.is-filled {
+        .uni-list-item__extra-text {
+          color: rgba(0, 0, 0, 0.9) !important;
+        }
+      }
+    }
+
+    &.mgb10 {
+      margin-bottom: 20rpx;
+    }
+  }
+}
+</style>

@@ -6,7 +6,7 @@
 				<!-- name:MsgCenter 消息中心权限-->
 				<view class="bell-wrap" v-if="hasMenu('MsgCenter')">
 					<image class="icon" src="/static/images/index/bell.png" mode="widthFix" />
-					<view class="badge">99+</view>
+					<view class="badge">{{ toReadCount > 99 ? '99+' : toReadCount }}</view>
 				</view>
 			</view>
 			<view class="header-title">首页</view>
@@ -55,6 +55,7 @@ export default {
 		return {
 			todoCount: '',
 			myCreateCount: '',
+			toReadCount: '',
 			sectionList: [{
 				title: '客户开发管理',
 				items: [{
@@ -163,6 +164,7 @@ export default {
 			statisticsCountApi().then((res) => {
 				this.todoCount = res.data.todoCount || '';
 				this.myCreateCount = res.data.myCreateCount || '';
+				this.toReadCount = res.data.toReadCount || '';
 			});
 		},
 		async loadMenusAndFilter() {

+<template>
+  <view class="page">
+    <scroll-view class="scroll" scroll-y>
+      <view class="detail-page">
+        <view class="section">
+          <text class="row company">{{ detail.title }}</text>
+          <view class="row"><text class="label">内容</text><text class="value">{{ detail.content }}</text></view>
+        </view>
+      </view>
+    </scroll-view>
+  </view>
+</template>
+
+<script>
+import { getContentApi } from '@/api/message.js'
+
+export default {
+  data() {
+    return {
+      detail: { title: '', content: '' }
+    }
+  },
+  onLoad(options) {
+    const id = options && (options.id || options.code) || ''
+    if (!id) return
+    this.loadDetail(id)
+  },
+  methods: {
+    loadDetail(id) {
+      getContentApi(id)
+        .then(res => {
+          const d = res && res.data ? res.data : {}
+          this.detail = { title: d.title || '', content: d.content || '' }
+        })
+        .catch(() => {
+          this.detail = { title: '', content: '' }
+          uni.showToast({ title: '加载失败', icon: 'none' })
+        })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.page { display: flex; flex-direction: column; height: 100%; }
+.scroll { flex: 1; padding: 8rpx 0 0; }
+.detail-page { background: #f3f3f3; }
+.section { padding: 32rpx; background: #fff; }
+.row {
+  display: flex;
+  margin-bottom: 28rpx;
+
+  &:last-child {
+    margin-bottom: 0;
+  }
+
+  &.company {
+    font-size: 36rpx;
+    font-weight: 600;
+    color: rgba(0, 0, 0, 0.9);
+    line-height: 50rpx;
+  }
+
+  .label {
+    max-width: 420rpx;
+    line-height: 32rpx;
+    font-size: 28rpx;
+    color: rgba(0, 0, 0, 0.6);
+  }
+
+  .value {
+    flex: 1;
+    line-height: 32rpx;
+    font-size: 28rpx;
+    color: rgba(0, 0, 0, 0.9);
+    text-align: right;
+
+    &.act {
+      color: $theme-primary;
+    }
+  }
+}
+</style>
+

+<template>
+    <view class="page">
+        <view class="message-list-fixed">
+            <view class="search-row">
+                <uni-search-bar v-model="searchKeyword" radius="6" placeholder="请输入标题" clearButton="auto"
+                    cancelButton="none" bgColor="#F3F3F3" textColor="rgba(0,0,0,0.4)" @confirm="search"
+                    @input="onSearchInput" />
+                <view class="tool-icons">
+                    <image class="tool-icon" src="/static/images/dev_manage/filter_icon.png" @click="openFilter" />
+                </view>
+            </view>
+        </view>
+
+        <view class="list-box">
+            <card-list ref="cardRef" :fetch-fn="fetchList" :query="query" :extra="extraParams" row-key="id"
+                :enable-refresh="true" :enable-load-more="true" @loaded="onCardLoaded" @error="onCardError">
+        <template v-slot="{ item }">
+          <view class="card" @click.stop="onCardClick(item)">
+            <view class="card-header">
+              <text class="title omit2">{{ item.title || '-' }}</text>
+            </view>
+                        <view class="info-row">
+                            <text>是否已读</text><text>{{ item.readed ? '是' : '否' }}</text>
+                        </view>
+                        <view class="info-row">
+                            <text>创建时间</text><text>{{ item.createTime || '-' }}</text>
+                        </view>
+                    </view>
+                </template>
+            </card-list>
+        </view>
+
+        <filter-modal :visible.sync="filterVisible" :value.sync="filterForm" title="筛选" @reset="onFilterReset"
+            @confirm="onFilterConfirm">
+            <template v-slot="{ model }">
+                <view class="filter-form">
+                    <view class="form-item">
+                        <view class="label">是否已读</view>
+                        <uni-data-checkbox mode="tag" :multiple="false" :value-field="'value'" :text-field="'text'"
+                            v-model="model.readed" :localdata="readOptions" />
+                    </view>
+                    <view class="form-item">
+                        <view class="label">创建时间</view>
+                        <uni-datetime-picker type="daterange" v-model="model.dateRange" start="2023-01-01" />
+                    </view>
+                </view>
+            </template>
+        </filter-modal>
+    </view>
+</template>
+
+<script>
+import CardList from '@/components/card/index.vue'
+import FilterModal from '@/components/filter/index.vue'
+import { queryApi as messageQueryApi } from '@/api/message.js'
+
+export default {
+    name: 'MessageList',
+    components: { CardList, FilterModal },
+    data() {
+        return {
+            searchKeyword: '',
+            searchKeywordDebounced: '',
+            searchDebounceTimer: null,
+
+            // 给到 card 的筛选值
+            query: { readed: '', dateRange: [] },
+            extraParams: {},
+
+            // 筛选弹框
+            filterVisible: false,
+            filterForm: { readed: false, dateRange: [] },
+            readOptions: [
+                { value: true, text: '是' },
+                { value: false, text: '否' }
+            ],
+
+            currentItems: []
+        }
+    },
+    computed: {
+        extraCombined() {
+            return {
+                title: this.searchKeywordDebounced || undefined
+            }
+        }
+    },
+    watch: {
+        extraCombined: {
+            deep: true,
+            handler(v) {
+                this.extraParams = v
+            },
+            immediate: true
+        }
+    },
+    created() {
+        const [start, end] = this.getDefaultDateRange()
+        this.filterForm.dateRange = [start, end]
+        this.query = { readed: this.filterForm.readed, dateRange: [start, end] }
+    },
+    onReachBottom() {
+        if (this.$refs && this.$refs.cardRef && this.$refs.cardRef.onLoadMore) {
+            this.$refs.cardRef.onLoadMore()
+        }
+    },
+    beforeDestroy() {
+        if (this.searchDebounceTimer) {
+            clearTimeout(this.searchDebounceTimer)
+            this.searchDebounceTimer = null
+        }
+    },
+    methods: {
+        // 默认日期范围：当前日期前一个月到今日
+        getDefaultDateRange() {
+            const fmt = d => {
+                const y = d.getFullYear()
+                const m = String(d.getMonth() + 1).padStart(2, '0')
+                const dd = String(d.getDate()).padStart(2, '0')
+                return `${y}-${m}-${dd}`
+            }
+            const end = new Date()
+            const start = new Date(end)
+            start.setMonth(start.getMonth() - 1)
+            return [fmt(start), fmt(end)]
+        },
+        onCardLoaded({ items }) {
+            this.currentItems = items
+        },
+    onCardError() {
+      uni.showToast({ title: '列表加载失败', icon: 'none' })
+    },
+    onCardClick(item) {
+      const id = (item && (item.id || item.code)) || ''
+      if (!id) return
+      const query = '?id=' + encodeURIComponent(id)
+      uni.navigateTo({ url: '/pages/message/detail' + query })
+    },
+        // 输入实时搜索：1200ms 防抖
+        onSearchInput(val) {
+            if (this.searchDebounceTimer) clearTimeout(this.searchDebounceTimer)
+            this.searchDebounceTimer = setTimeout(() => {
+                this.searchKeywordDebounced = this.searchKeyword
+                this.searchDebounceTimer = null
+            }, 1200)
+        },
+        // 确认搜索
+        search(e) {
+            const val = e && e.value != null ? e.value : this.searchKeyword
+            this.searchKeyword = val
+            this.searchKeywordDebounced = val
+        },
+        openFilter() {
+            this.filterVisible = true
+        },
+        onFilterReset(payload) {
+            this.filterForm = payload
+        },
+        onFilterConfirm(payload) {
+            if ((payload.readed === '' || payload.readed == null) && this.filterForm.readed !== '') {
+                payload.readed = this.filterForm.readed
+            }
+            this.query = { ...payload }
+        },
+        // 列表接口
+        fetchList({ pageIndex, pageSize, query, extra }) {
+            const params = {
+                pageIndex,
+                pageSize,
+                ...extra,
+                ...query
+            }
+            if (Array.isArray(params.dateRange) && params.dateRange.length === 2) {
+                params.createTimeStart = params.dateRange[0] + ' 00:00:00'
+                params.createTimeEnd = params.dateRange[1] + ' 23:59:59'
+                delete params.dateRange
+            }
+            if (this.searchKeywordDebounced) {
+                params.title = this.searchKeywordDebounced
+            }
+            return messageQueryApi(params)
+                .then(res => {
+                    const _data = res.data || {}
+                    const records = _data.datas || []
+                    const totalCount = _data.totalCount || 0
+                    const hasNext = _data.hasNext || false
+                    return { records, totalCount, hasNext }
+                })
+                .catch(err => {
+                    console.error('fetchList error', err)
+                    this.onCardError()
+                    return { records: [], totalCount: 0, hasNext: false }
+                })
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.page {
+    display: flex;
+    flex-direction: column;
+    height: 100vh;
+}
+
+.message-list-fixed {
+    position: fixed;
+    top: 96rpx;
+    left: 0;
+    right: 0;
+    z-index: 2;
+    background: #fff;
+
+    .search-row {
+        display: flex;
+        align-items: center;
+        padding: 16rpx 32rpx;
+
+        .uni-searchbar {
+            padding: 0;
+            flex: 1;
+        }
+
+        .tool-icons {
+            display: flex;
+
+            .tool-icon {
+                width: 48rpx;
+                height: 48rpx;
+                display: block;
+                margin-left: 32rpx;
+            }
+        }
+    }
+}
+
+/* 仅当前页覆盖 uni-search-bar 盒子高度 */
+::v-deep .uni-searchbar__box {
+    height: 80rpx !important;
+    justify-content: start;
+
+    .uni-searchbar__box-search-input {
+        font-size: 32rpx !important;
+    }
+}
+
+.list-box {
+    flex: 1;
+    padding-top: 132rpx;
+
+    .card {
+        position: relative;
+    }
+
+    .card-header {
+        margin-bottom: 28rpx;
+
+        .title {
+            font-size: 36rpx;
+            font-weight: 600;
+            line-height: 50rpx;
+            color: rgba(0, 0, 0, 0.9);
+        }
+    }
+
+    .info-row {
+        display: flex;
+        align-items: center;
+        color: rgba(0, 0, 0, 0.6);
+        font-size: 28rpx;
+        margin-bottom: 24rpx;
+
+        &:last-child {
+            margin-bottom: 0;
+        }
+
+        text {
+            width: 60%;
+            line-height: 32rpx;
+
+            &:last-child {
+                color: rgba(0, 0, 0, 0.9);
+                width: 40%;
+            }
+        }
+    }
+}
+
+.filter-form {
+  .form-item {
+    margin-bottom: 24rpx;
+  }
+
+  .label {
+    margin-bottom: 20rpx;
+    color: rgba(0, 0, 0, 0.9);
+    height: 44rpx;
+    line-height: 44rpx;
+    font-size: 30rpx;
+  }
+
+  .uni-easyinput {
+    border: 1rpx solid #f3f3f3;
+  }
+
+}
+
+/* 深度覆盖 uni-data-checkbox（mode=tag）内部的 tag 展示与间距 */
+::v-deep .filter-form .uni-data-checklist .checklist-group {
+  .checklist-box {
+    &.is--tag {
+      width: 212rpx;
+      margin-top: 0;
+      margin-bottom: 24rpx;
+      margin-right: 24rpx;
+      height: 80rpx;
+      padding: 0;
+      border-radius: 12rpx;
+      background-color: #f3f3f3;
+      border-color: #f3f3f3;
+
+      &:nth-child(3n) {
+        margin-right: 0;
+      }
+
+      .checklist-content {
+        display: flex;
+        justify-content: center;
+      }
+
+      .checklist-text {
+        color: rgba(0, 0, 0, 0.9);
+        font-size: 28rpx;
+      }
+    }
+
+    &.is-checked {
+      background-color: $theme-primary-plain-bg !important;
+      border-color: $theme-primary-plain-bg !important;
+
+      .checklist-text {
+        color: $theme-primary !important;
+      }
+    }
+  }
+
+}
+</style>

@@ -37,14 +37,15 @@
 
           <uni-list-item title="交货方式">
             <template v-slot:footer>
-              <uni-easyinput v-model="form.deliveryMethod" placeholder="请输入交货方式" :inputBorder="false" />
+              <view class="readonly-text">{{ form.deliveryMethod }}</view>
             </template>
           </uni-list-item>
         </view>
 
         <!-- 产品 -->
         <view class="section2">
-          <Product mode="add" :list="initPurchaseOrderLineList" @change="purchaseOrderLineListChange" />
+          <Product mode="add" :list="initPurchaseOrderLineList" @change="purchaseOrderLineListChange"
+            :orderDate="form.orderDate" />
         </view>
 
         <view class="section">
@@ -69,17 +70,6 @@
               </view>
             </template>
           </uni-list-item>
-          <uni-list-item class="amount-item">
-            <template v-slot:body>
-              <view class="item-title"><text>包装费</text></view>
-            </template>
-            <template v-slot:footer>
-              <view class="amount-row">
-                <uni-easyinput type="number" v-model="form.packagingFee" placeholder="0.00" :inputBorder="false" />
-                <text class="unit">元</text>
-              </view>
-            </template>
-          </uni-list-item>
           <uni-list-item class="select-item" :class="form.executionStandardName ? 'is-filled' : 'is-empty'" clickable
             @click="openSheet('executionStandard')" :rightText="form.executionStandardName || '请选择'" showArrow>
             <template v-slot:body>
@@ -170,18 +160,18 @@
 
         <!-- 产品 -->
         <view class="mgb10">
-          <Product mode="view" :list="form.purchaseOrderLineList"
-            :totalQuantity="form.totalQuantity || 0" />
+          <Product mode="view" :list="form.purchaseOrderLineList" :totalQuantity="form.totalQuantity || 0" />
         </view>
 
         <view class="section">
           <view class="row"><text class="label">价格表编号</text><text class="value">{{ form.priceListNo }}</text></view>
           <view class="row"><text class="label">开票情况</text><text class="value">{{ form.invoicingStatus }}</text></view>
           <view class="row"><text class="label">运费</text><text class="value">{{ form.shippingCost }}</text></view>
-          <view class="row"><text class="label">包装费</text><text class="value">{{ form.packagingFee }}</text></view>
           <view class="row"><text class="label">执行标准</text><text class="value">{{ getDicName('APPLICABLE_STANDARD',
             form.executionStandard, dicOptions.APPLICABLE_STANDARD) }}</text></view>
-          <view v-if="form.executionStandard === 'OTHER'" class="row"><text class="label">标准</text><text class="value">{{ form.executionStandardRemarks }}</text></view>
+          <view v-if="form.executionStandard === 'OTHER'" class="row"><text class="label">标准</text><text
+              class="value">{{
+                form.executionStandardRemarks }}</text></view>
         </view>
 
         <view class="title-header">
@@ -198,7 +188,15 @@
           <view class="row"><text class="label">包装</text><text class="value">{{ form.packaging }}</text></view>
           <view class="row"><text class="label">备注</text><text class="value">{{ form.remarks }}</text></view>
         </view>
-
+        <!-- 品质科 可填写（不是办事处内勤） -->
+        <uni-list v-if="form.showProductionProcess" >
+          <uni-list-item title="生产工艺">
+            <template v-slot:footer>
+              <uni-easyinput type="textarea" v-model="form.productionProcess" placeholder="请输入生产工艺"
+                :inputBorder="false" />
+            </template>
+          </uni-list-item>
+        </uni-list>
       </view>
     </scroll-view>
 
@@ -411,7 +409,7 @@ export default {
 
     &__container {
       padding: 32rpx;
-      align-items: center;
+      align-items: start !important;
 
       .uni-easyinput {
 

@@ -13,7 +13,8 @@
           </view>
           <view class="row"><text class="label">订货日期</text><text class="value">{{ form.orderDate }}</text></view>
           <view class="row"><text class="label">生产厂</text><text class="value">{{ form.workshopName }}</text></view>
-          <view class="row"><text class="label">结算方式或期限</text><text class="value">{{ form.settlementTerms }}</text></view>
+          <view class="row"><text class="label">结算方式或期限</text><text class="value">{{ form.settlementTerms }}</text>
+          </view>
           <view class="row"><text class="label">交货方式</text><text class="value">{{ form.deliveryMethod }}</text></view>
         </view>
 
@@ -21,29 +22,33 @@
         <view class="mgb10">
           <Product mode="view" :list="form.purchaseOrderLineList" :totalQuantity="form.totalQuantity || 0" />
         </view>
-       
+
         <view class="section">
           <view class="row"><text class="label">价格表编号</text><text class="value">{{ form.priceListNo }}</text></view>
           <view class="row"><text class="label">开票情况</text><text class="value">{{ form.invoicingStatus }}</text></view>
           <view class="row"><text class="label">运费</text><text class="value">{{ form.shippingCost }}</text></view>
-          <view class="row"><text class="label">包装费</text><text class="value">{{ form.packagingFee }}</text></view>
           <view class="row"><text class="label">执行标准</text><text class="value">{{ getDicName('APPLICABLE_STANDARD',
             form.executionStandard, dicOptions.APPLICABLE_STANDARD) }}</text></view>
-          <view v-if="form.executionStandard === 'OTHER'" class="row"><text class="label">标准</text><text class="value">{{ form.executionStandardRemarks }}</text></view>
+          <view v-if="form.executionStandard === 'OTHER'" class="row"><text class="label">标准</text><text
+              class="value">{{ form.executionStandardRemarks }}</text></view>
         </view>
-        
+
         <view class="title-header">
           <image class="title-header_icon" src="/static/images/title.png" />
           <span>具体质量要求</span>
         </view>
         <view class="section">
-          <view class="row"><text class="label">件重条头</text><text class="value">{{ form.pieceWeightHeader }}</text></view>
+          <view class="row"><text class="label">件重条头</text><text class="value">{{ form.pieceWeightHeader }}</text>
+          </view>
           <view class="row"><text class="label">表面</text><text class="value">{{ form.surface }}</text></view>
           <view class="row"><text class="label">公差</text><text class="value">{{ form.tolerance }}</text></view>
           <view class="row"><text class="label">性能</text><text class="value">{{ form.performance }}</text></view>
           <view class="row"><text class="label">成分</text><text class="value">{{ form.element }}</text></view>
           <view class="row"><text class="label">包装</text><text class="value">{{ form.packaging }}</text></view>
           <view class="row"><text class="label">备注</text><text class="value">{{ form.remarks }}</text></view>
+          <!-- 品质科 可查看 -->
+          <view v-if="form.showProductionProcess" class="row"><text class="label">生产工艺</text><text class="value">{{
+            form.productionProcess }}</text></view>
         </view>
 
       </view>
@@ -53,7 +58,7 @@
 </template>
 
 <script>
-import { getDetailApi, cancelApi } from '@/api/order_list.js'
+import { getDetailApi, cancelApi, checkApi } from '@/api/order_list.js'
 import Product from './product.vue'
 import DetailButtons from '@/components/detail-buttons/index.vue'
 import {
@@ -100,11 +105,11 @@ export default {
       const f = this.statusFlags;
       console.log('displayButtons__f', f)
       return [
-        { ...this.buttons[0], visible: f.isRefuse && f.contractCreateBy },
-        { ...this.buttons[1], visible: true },
-        { ...this.buttons[2], visible: f.isAudit && f.canExamine },
-        { ...this.buttons[3], visible: f.canDeliveryApply },
-        { ...this.buttons[4], visible: f.isRefuse && f.contractCreateBy },
+        { ...this.buttons[0], visible: f.isRefuse && f.contractCreateBy && this.$auth.hasPermi('order-manage:order-list:modify') },
+        { ...this.buttons[1], visible: this.$auth.hasPermi('order-manage:order-list:review') },
+        { ...this.buttons[2], visible: f.isAudit && f.canExamine && this.$auth.hasPermi('order-manage:order-list:approve') },
+        { ...this.buttons[3], visible: f.canDeliveryApply && this.$auth.hasPermi('order-manage:order-list:apply') },
+        { ...this.buttons[4], visible: f.isRefuse && f.contractCreateBy && this.$auth.hasPermi('order-manage:order-list:cancel') },
       ]
     }
   },
@@ -157,8 +162,16 @@ export default {
     },
     onShipmentApply() {
       const id = this.getBusinessId()
-      const query = id ? ('?id=' + encodeURIComponent(id)) : ''
-      uni.navigateTo({ url: '/pages/order_list/shipment_apply' + query })
+      const query = id ? ('?id=' + encodeURIComponent(id)) : '';
+      checkApi({ id }).then(res => {
+        if (res.code === 200) {
+          uni.navigateTo({ url: '/pages/order_list/shipment_apply' + query })
+        } else {
+          uni.showToast({ title: res.msg || '失败', icon: 'none' })
+        }
+      }).catch((e) => {
+        uni.showToast({ title: e.msg, icon: 'none' })
+      })
     },
     onCancel() {
       const id = this.getBusinessId()

@@ -23,9 +23,11 @@
             <view class="card-header">
               <text class="title omit2">{{ item.orderingUnitName }}</text>
               <text v-if="item.status" :class="['status', `status_${item.status}`]">{{ filterStatus(item.status)
-                }}</text>
+              }}</text>
             </view>
             <view class="info-row"><text>订单编号</text><text>{{ item.orderNo }}</text></view>
+            <view class="info-row"><text>审核状态</text><text><span :class="['status', `status_${item.examineStatus}`]">{{
+              filterExamineStatus(item.examineStatus) }}</span></text></view>
             <view class="info-row"><text>生产厂</text><text>{{ item.workshopName }}</text></view>
             <view class="info-row"><text>办事处</text><text>{{ item.deptName }}</text></view>
             <view class="info-row"><text>订货日期</text><text>{{ item.orderDate }}</text></view>
@@ -40,7 +42,8 @@
         <view class="filter-form">
           <view class="form-item">
             <view class="label">办事处</view>
-            <uni-easyinput v-model="model.deptName" placeholder="请输入办事处" :inputBorder="false" />
+            <uni-easyinput v-model="model.deptName" placeholder="请输入办事处" :inputBorder="false"
+              placeholderStyle="font-size:14px" />
           </view>
 
           <view class="form-item">
@@ -56,6 +59,12 @@
           </view>
 
           <view class="form-item">
+            <view class="label">审核状态</view>
+            <uni-data-checkbox mode="tag" :multiple="false" :value-field="'value'" :text-field="'text'"
+              v-model="model.examineStatus" @change="onExamineStatusChange" :localdata="examineStatusOptions" />
+          </view>
+
+          <view class="form-item">
             <view class="label">订货日期</view>
             <uni-datetime-picker type="daterange" v-model="model.dateRange" start="2023-01-01" />
           </view>
@@ -93,6 +102,7 @@ export default {
       },
       workshopOptions: [],
       statusOptions: [],
+      examineStatusOptions: [],
       query: {},
       extraParams: {},
       currentItems: []
@@ -105,6 +115,7 @@ export default {
     ]
     this.extraParams = { type: this.tabValue }
     this.loadStatusOptions()
+    this.loadExamineStatusOptions()
     this.loadWorkshopOptions()
   },
   onReachBottom() {
@@ -118,11 +129,19 @@ export default {
         const res = await getDicByCodeApi('ORDER_STATUS')
         const list = res.data || []
         this.statusOptions = list.map(it => ({ text: it.name || '', value: it.code || '' }));
-        console.log('this.statusOptions', this.statusOptions)
       } catch (e) {
         this.statusOptions = []
       }
     },
+    async loadExamineStatusOptions() {
+      try {
+        const res = await getDicByCodeApi('AUDIT_STATUS')
+        const list = res.data || []
+        this.examineStatusOptions = list.map(it => ({ text: it.name || '', value: it.code || '' }));
+      } catch (e) {
+        this.examineStatusOptions = []
+      }
+    },
     async loadWorkshopOptions() {
       try {
         const res = await workshopQueryApi({ pageIndex: 1, pageSize: 9999 })
@@ -179,6 +198,10 @@ export default {
       const raw = e && e.detail && e.detail.value !== undefined ? e.detail.value : (e && e.value !== undefined ? e.value : '')
       this.filterForm.status = raw
     },
+    onExamineStatusChange(e) {
+      const raw = e && e.detail && e.detail.value !== undefined ? e.detail.value : (e && e.value !== undefined ? e.value : '')
+      this.filterForm.examineStatus = raw
+    },
     onWorkshopChange(e) {
       const raw = e && e.detail && e.detail.value !== undefined ? e.detail.value : (e && e.value !== undefined ? e.value : '')
       this.filterForm.workshopId = raw
@@ -201,13 +224,8 @@ export default {
         let records = _data.datas || _data.list || _data.records || []
         const totalCount = _data.totalCount || _data.count || 0
         const hasNext = _data.hasNext || false
-        const statusTextMap = (this.statusOptions || []).reduce((acc, it) => {
-          acc[String(it.value)] = it.text
-          return acc
-        }, {})
         records = records.map(it => ({
-          ...it,
-          statusName: statusTextMap[String(it.status)] || ''
+          ...it
         }))
         return { records, totalCount, hasNext }
       }).catch(() => {
@@ -218,6 +236,9 @@ export default {
     filterStatus(status) {
       return this.statusOptions.filter(item => item.value === status)[0].text || '';
     },
+    filterExamineStatus(status) {
+      return this.examineStatusOptions.filter(item => item.value === status)[0].text || '';
+    },
     onCardClick(item) {
       const id = (item && (item.id || item.code)) || ''
       if (!id) return
@@ -383,6 +404,41 @@ export default {
       &:last-child {
         color: rgba(0, 0, 0, 0.9);
       }
+
+      .status {
+        display: inline-block;
+        padding: 4rpx 12rpx;
+        border-radius: 6rpx;
+        font-size: 24rpx;
+        color: #fff;
+        line-height: 40rpx;
+
+        // 审核中
+        &.status_AUDIT {
+          background: rgb(242, 243, 255);
+          color: $theme-primary;
+
+        }
+
+        // 审核通过
+        &.status_PASS {
+          color: rgb(43, 164, 113);
+          background-color: rgb(227, 249, 233);
+        }
+
+        // 已驳回
+        &.status_REFUSE {
+          color: rgb(213, 73, 65);
+          background-color: rgb(255, 240, 237);
+        }
+
+        // 已取消
+        &.status_CANCEL {
+          background: #e7e7e7;
+          color: rgba(0, 0, 0, 0.6);
+        }
+      }
+
     }
   }
 

@@ -36,14 +36,14 @@
 
           <uni-list-item title="交货方式">
             <template v-slot:footer>
-              <uni-easyinput v-model="form.deliveryMethod" placeholder="请输入交货方式" :inputBorder="false" />
+              <view class="readonly-text">{{ form.deliveryMethod }}</view>
             </template>
           </uni-list-item>
         </view>
 
         <!-- 产品 -->
         <view class="section2">
-          <Product mode="add" :list="initPurchaseOrderLineList" @change="purchaseOrderLineListChange" />
+          <Product mode="add" :list="initPurchaseOrderLineList" @change="purchaseOrderLineListChange" :pageType="'modify'" :orderDate="form.orderDate" />
         </view>
 
         <view class="section">
@@ -68,17 +68,6 @@
               </view>
             </template>
           </uni-list-item>
-          <uni-list-item class="amount-item">
-            <template v-slot:body>
-              <view class="item-title"><text>包装费</text></view>
-            </template>
-            <template v-slot:footer>
-              <view class="amount-row">
-                <uni-easyinput type="number" v-model="form.packagingFee" placeholder="0.00" :inputBorder="false" />
-                <text class="unit">元</text>
-              </view>
-            </template>
-          </uni-list-item>
           <uni-list-item class="select-item" :class="form.executionStandardName ? 'is-filled' : 'is-empty'" clickable
             @click="openSheet('executionStandard')" :rightText="form.executionStandardName || '请选择'" showArrow>
             <template v-slot:body>
@@ -276,6 +265,7 @@ export default {
       }
     },
     purchaseOrderLineListChange(data) {
+      console.log('purchaseOrderLineListChange__data', data)
       const list = Array.isArray(data) ? data : []
       this.form.purchaseOrderLineList = list;
     },

@@ -52,17 +52,32 @@
                     <view class="row" :class="{ 'noneStyle': item.showSalesPrice }" v-if="item.showSalesPrice"><text
                             class="label">销售价格</text><text class="value">{{
                                 item.salesPrice }}</text></view>
-
                     <uni-list class="edit-list">
+                        <uni-list-item class="amount-item">
+                            <template v-slot:body>
+                                <view class="item-title"><text>包装费</text></view>
+                            </template>
+                            <template v-slot:footer>
+                                <view class="amount-row">
+                                    <uni-easyinput type="digit" v-model="item.packagingFee" placeholder="0.00"
+                                        :inputBorder="false"
+                                        @input="onNonNegativeNumberInput($event, item, idx, 'packagingFee')"
+                                        @blur="onNonNegativeNumberBlur(item, idx, 'packagingFee')" />
+                                    <text class="unit">元</text>
+                                </view>
+                            </template>
+                        </uni-list-item>
                         <uni-list-item title="发货日期">
                             <template v-slot:footer>
-                                <uni-datetime-picker type="date" v-model="item.deliveryDate" />
+                                <uni-datetime-picker type="date" v-model="item.deliveryDate" :start="minDeliveryDate"
+                                    @change="onDeliveryChange($event, item, idx)" />
                             </template>
                         </uni-list-item>
                         <uni-list-item title="考核超协">
                             <template v-slot:footer>
-                                <uni-easyinput v-model="item.assessmentExceedsAgreement" placeholder="请输入考核超协"
-                                    :inputBorder="false" />
+                                <uni-easyinput :disabled="pageType === 'modify'"
+                                    v-model="item.assessmentExceedsAgreement"
+                                    :placeholder="pageType === 'modify' ? '' : '请输入考核超协'" :inputBorder="false" />
                             </template>
                         </uni-list-item>
                     </uni-list>
@@ -112,10 +127,12 @@
                 <!-- showSalesPrice 判断是否显示 -->
                 <view class="row" v-if="item.showSalesPrice"><text class="label">销售价格</text><text class="value">{{
                     item.salesPrice }}</text></view>
+                <view class="row"><text class="label">包装费</text><text class="value">{{
+                    item.packagingFee }}</text></view>
                 <view class="row"><text class="label">发货日期</text><text class="value">{{ item.deliveryDate }}</text>
                 </view>
                 <view class="row"><text class="label">考核超协</text><text class="value">{{ item.assessmentExceedsAgreement
-                }}</text></view>
+                        }}</text></view>
             </view>
             <view class="view-total">
                 <view class="head">合计</view>
@@ -136,7 +153,9 @@ export default {
         mode: { type: String, default: 'add' },
         list: { type: Array, default: () => [] },
         max: { type: Number, default: 8 },
-        totalQuantity: { type: Number, default: 0 }
+        totalQuantity: { type: Number, default: 0 },
+        pageType: { type: String, default: '' },
+        orderDate: { type: String, default: '' }
     },
     data() {
         return {
@@ -145,6 +164,21 @@ export default {
         }
     },
     computed: {
+        minDeliveryDate() {
+            const s = this.orderDate
+            if (!s) return ''
+            const parts = String(s).split('-')
+            const y = Number(parts[0])
+            const m = Number(parts[1])
+            const d = Number(parts[2])
+            if (!y || !m || !d) return ''
+            const dt = new Date(y, m - 1, d)
+            dt.setDate(dt.getDate() + 1)
+            const yy = dt.getFullYear()
+            const mm = String(dt.getMonth() + 1).padStart(2, '0')
+            const dd = String(dt.getDate()).padStart(2, '0')
+            return `${yy}/${mm}/${dd}`
+        }
     },
     watch: {
         items: {
@@ -168,7 +202,7 @@ export default {
     },
     methods: {
         defaultItem() {
-            return { collapsed: false }
+            return { collapsed: false, packagingFee: '' }
         },
         toggleItem(idx) {
             const it = this.items[idx]
@@ -177,13 +211,58 @@ export default {
             this.$set(this.items, idx, it)
         },
         emitChange() {
-            const out = this.items.map(it => ({ ...it }))
+            console.log('emitChange__items', this.items)
+            const out = this.items.map(it => JSON.parse(JSON.stringify(it)))
+            console.log('emitChange__out', out)
             this.$emit('input', out)
             this.$emit('update:value', out)
             this.$emit('change', out)
         },
         toggleViewCollapse() {
             this.collapsedView = !this.collapsedView
+        },
+        onDeliveryChange(e, item, idx) {
+            const getStr = (x) => {
+                if (x && x.detail && x.detail.value !== undefined) return x.detail.value
+                if (typeof x === 'string') return x
+                return item && item.deliveryDate ? item.deliveryDate : ''
+            }
+            const val = getStr(e)
+            if (!val || !this.orderDate) return
+            const parse = (s) => {
+                const p = String(s).replace(/\//g, '-').split('-')
+                const y = Number(p[0])
+                const m = Number(p[1])
+                const d = Number(p[2])
+                return new Date(y, m - 1, d)
+            }
+            const sel = parse(val)
+            const ord = parse(this.orderDate)
+            if (!(sel > ord)) {
+                item.deliveryDate = ''
+                this.$set(this.items, idx, { ...item })
+                uni.showToast({ title: '发货日期必须大于订货日期', icon: 'none' })
+            }
+        },
+        onNonNegativeNumberInput(val, item, idx, field) {
+            let v = String(val != null ? val : (item && item[field]) || '')
+            v = v.replace(/[^0-9.]/g, '')
+            v = v.replace(/(\..*)\./g, '$1')
+            if (v.startsWith('.')) v = '0' + v
+            if (v === '') { item[field] = ''; if (typeof idx === 'number') this.$set(this.items, idx, { ...item }); return }
+            const num = Number(v)
+            if (isNaN(num) || num < 0) {
+                item[field] = '0'
+            } else {
+                item[field] = v
+            }
+            if (typeof idx === 'number') this.$set(this.items, idx, { ...item })
+        },
+        onNonNegativeNumberBlur(item, idx, field) {
+            const v = String((item && item[field]) || '')
+            const num = Number(v)
+            if (isNaN(num) || num < 0) item[field] = '0'
+            if (typeof idx === 'number') this.$set(this.items, idx, { ...item })
         }
     }
 }

@@ -24,7 +24,6 @@
           <view class="row"><text class="label">价格表编号</text><text class="value">{{ form.priceListNo }}</text></view>
           <view class="row"><text class="label">开票情况</text><text class="value">{{ form.invoicingStatus }}</text></view>
           <view class="row"><text class="label">运费</text><text class="value">{{ form.shippingCost }}</text></view>
-          <view class="row"><text class="label">包装费</text><text class="value">{{ form.packagingFee }}</text></view>
           <view class="row"><text class="label">执行标准</text><text class="value">{{ getDicName('APPLICABLE_STANDARD',
             form.executionStandard, dicOptions.APPLICABLE_STANDARD) }}</text></view>
           <view v-if="form.executionStandard === 'OTHER'" class="row"><text class="label">标准</text><text class="value">{{ form.executionStandardRemarks }}</text></view>
@@ -42,6 +41,8 @@
           <view class="row"><text class="label">成分</text><text class="value">{{ form.element }}</text></view>
           <view class="row"><text class="label">包装</text><text class="value">{{ form.packaging }}</text></view>
           <view class="row"><text class="label">备注</text><text class="value">{{ form.remarks }}</text></view>
+          <!-- 品质科 可查看 -->
+          <view v-if="form.showProductionProcess" class="row"><text class="label">生产工艺</text><text class="value">{{ form.productionProcess }}</text></view>
         </view>
 
       </view>

@@ -64,10 +64,10 @@ export default {
     displayButtons() {
       const f = this.statusFlags
       return [
-        { ...this.buttons[0], visible: f.canEdit },
-        { ...this.buttons[1], visible: true },
-        { ...this.buttons[2], visible: f.canAudit },
-        { ...this.buttons[3], visible: f.canCancel },
+        { ...this.buttons[0], visible: f.canEdit && this.$auth.hasPermi('order-manage:revoke-list:modify') },
+        { ...this.buttons[1], visible: this.$auth.hasPermi('order-manage:revoke-list:review') },
+        { ...this.buttons[2], visible: f.canAudit && this.$auth.hasPermi('order-manage:revoke-list:approve') },
+        { ...this.buttons[3], visible: f.canCancel && this.$auth.hasPermi('order-manage:revoke-list:cancel') },
       ]
     }
   },

@@ -5,7 +5,7 @@
         <uni-search-bar v-model="searchKeyword" radius="6" placeholder="请输入订货单位或订单编号" clearButton="auto"
           cancelButton="none" bgColor="#F3F3F3" textColor="rgba(0,0,0,0.4)" @confirm="onSearchConfirm"
           @input="onSearchInput" />
-        <image class="tool-icon" src="/static/images/dev_manage/add_icon.png" @click="onAdd" />
+        <image v-if="$auth.hasPermi('order-manage:revoke-list:add')" class="tool-icon" src="/static/images/dev_manage/add_icon.png" @click="onAdd" />
         <image class="tool-icon" src="/static/images/dev_manage/filter_icon.png" @click="openFilter" />
       </view>
     </view>

@@ -2,9 +2,12 @@ import store from '@/store'
 
 function authPermission(permission) {
   const all_permission = "*:*:*"
-  const permissions = store.getters && store.getters.permissions
+  const g = store.getters || {}
+  const permissions = Array.isArray(g.permissions) ? g.permissions : []
+  const roles = Array.isArray(g.roles) ? g.roles : []
+  const sources = [...permissions, ...roles]
   if (permission && permission.length > 0) {
-    return permissions.some(v => {
+    return sources.some(v => {
       return all_permission === v || v === permission
     })
   } else {

@@ -845,6 +845,16 @@
 		display: flex;
 		align-items: center;
 		position: relative;
+		border: none;
+	}
+
+	.uni-date-editor--x .uni-date-range {
+		border: 1px solid #e5e5e5;
+		padding-right: 80rpx;
+	}
+
+	.uni-date-editor--x .uniui-calendar {
+		display: none;
 	}
 
 	.uni-date-editor--x .uni-date__icon-clear {
@@ -854,6 +864,8 @@
 		/* #ifdef H5 */
 		cursor: pointer;
 		/* #endif */
+		position: relative;
+		left: -60rpx;
 	}
 
 	.uni-date__x-input {
@@ -865,8 +877,9 @@
 		position: relative;
 		flex: 1;
 		line-height: 35px;
-		font-size: 14px;
+		font-size: 16px;
 		overflow: hidden;
+		color: rgba(0, 0, 0, 0.4);
 	}
 
 	.text-center {