Merge branch 'cjerp-1.0_20260116' into publish_cjerp

@@ -48,6 +48,11 @@
     <ui_properties converted="true" />
     <ui_properties converted="true" />
   </component>
   </component>
   <component name="Git.Settings">
   <component name="Git.Settings">
+    <option name="RECENT_BRANCH_BY_REPOSITORY">
+      <map>
+        <entry key="$PROJECT_DIR$" value="publish_cjerp" />
+      </map>
+    </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   </component>
   <component name="ProjectColorInfo">{
   <component name="ProjectColorInfo">{
@@ -164,7 +169,19 @@
       <map>
       <map>
         <entry key="MAIN">
         <entry key="MAIN">
           <value>
           <value>
-            <State />
+            <State>
+              <option name="FILTERS">
+                <map>
+                  <entry key="branch">
+                    <value>
+                      <list>
+                        <option value="cjerp-1.0_20251220" />
+                      </list>
+                    </value>
+                  </entry>
+                </map>
+              </option>
+            </State>
           </value>
           </value>
         </entry>
         </entry>
       </map>
       </map>

 import request from '@/utils/request'
 import request from '@/utils/request'
-import { ContentTypeEnum } from '@/utils/httpEnum';
 import config from '@/config'
 import config from '@/config'
 import { getToken } from '@/utils/auth'
 import { getToken } from '@/utils/auth'
 
 
@@ -32,6 +31,20 @@ export function uploadFileApi(data) {
 }
 }
 
 
 /**
 /**
+ * 下载文件通用接口
+ * @param id
+ */
+export function downloadFileApi(id) {
+  return request({
+    url: `/download/security/url`,
+    method: 'get',
+    params: {
+      id
+    },
+  })
+}
+
+/**
  * 回去城市接口 省市区 一次性返回
  * 回去城市接口 省市区 一次性返回
  */
  */
 export function selectorCityApi() {
 export function selectorCityApi() {
@@ -63,4 +76,4 @@ export function generateCodeApi(type) {
       type
       type
     },
     },
   })
   })
-}
+}

+import request from '@/utils/request'
+import { ContentTypeEnum } from '@/utils/httpEnum';
+
+const baseUrl = '/requestCarTicket';
+// 查询列表
+export function queryApi(params) {
+  return request({
+    url: baseUrl + `/query`,
+    method: 'get',
+    params
+  })
+}
+
+// 根据ID查询详情数据
+export function getDetailApi(id) {
+  return request({
+    url:  baseUrl,
+    method: 'get',
+    params: { id }
+  })
+}
+
+// 新增保存
+export function createApi(params) {
+  return request({
+    url: baseUrl,
+    method: 'post',
+    data: params,
+    contentType: ContentTypeEnum.JSON
+  })
+}
+
+
+// 修改保存
+export function updateApi(params) {
+  return request({
+    url: baseUrl,
+    method: 'put',
+    data: params,
+    contentType: ContentTypeEnum.JSON
+  })
+}
+

+import request from '@/utils/request'
+import { ContentTypeEnum } from '@/utils/httpEnum';
+
+const baseUrl = '/delayedShipment';
+// 查询列表
+export function queryApi(params) {
+  return request({
+    url: baseUrl + `/query`,
+    method: 'get',
+    params
+  })
+}
+
+// 根据ID查询详情数据
+export function getDetailApi(id) {
+  return request({
+    url:  baseUrl,
+    method: 'get',
+    params: { id }
+  })
+}
+
+// 取消
+export function cancelApi(id) {
+  return request({
+    url:  baseUrl + '/cancel',
+    method: 'get',
+    params: { id }
+  })
+}
+
+// 延期发货按钮-选择的数据查询
+export function getShipmentPlanDetailApi(id) {
+  return request({
+    url:  '/shipments/plan/detail',
+    method: 'get',
+    params: { id }
+  })
+}
+
+// 新增保存
+export function createApi(params) {
+  return request({
+    url: baseUrl,
+    method: 'post',
+    data: params,
+    contentType: ContentTypeEnum.JSON
+  })
+}
+
+
+// 修改保存
+export function updateApi(params) {
+  return request({
+    url: baseUrl,
+    method: 'put',
+    data: params,
+    contentType: ContentTypeEnum.JSON
+  })
+}
+

@@ -2,13 +2,54 @@ import request from '@/utils/request'
 import { ContentTypeEnum } from '@/utils/httpEnum';
 import { ContentTypeEnum } from '@/utils/httpEnum';
 
 
 const baseUrl = '/draftRequestCarTicket';
 const baseUrl = '/draftRequestCarTicket';
+// 查询列表
+export function queryApi(params) {
+  return request({
+    url: baseUrl + `/query`,
+    method: 'get',
+    params
+  })
+}
+
+// 根据ID查询详情数据
+export function getDetailApi(id) {
+  return request({
+    url:  baseUrl,
+    method: 'get',
+    params: { id }
+  })
+}
+
+
+// 取消
+export function cancelApi(id) {
+  return request({
+    url:  baseUrl + '/cancel',
+    method: 'get',
+    params: { id }
+  })
+}
 
 
 // 新增保存
 // 新增保存
 export function createApi(params) {
 export function createApi(params) {
   return request({
   return request({
-    url: `${baseUrl}`,
+    url: baseUrl,
     method: 'post',
     method: 'post',
     data: params,
     data: params,
     contentType: ContentTypeEnum.JSON
     contentType: ContentTypeEnum.JSON
   })
   })
 }
 }
+
+
+
+// 修改保存
+export function updateApi(params) {
+  return request({
+    url: baseUrl,
+    method: 'put',
+    data: params,
+    contentType: ContentTypeEnum.JSON
+  })
+}
+
+

+import request from '@/utils/request'
+import { ContentTypeEnum } from '@/utils/httpEnum';
+
+const baseUrl = '/shipments/order';
+// 查询列表
+export function queryApi(params) {
+  return request({
+    url: baseUrl + `/query`,
+    method: 'get',
+    params
+  })
+}
+
+// 根据ID查询详情数据
+export function getDetailApi(id) {
+  return request({
+    url:  baseUrl,
+    method: 'get',
+    params: { id }
+  })
+}
+
+// 新增保存
+export function createApi(params) {
+  return request({
+    url: baseUrl,
+    method: 'post',
+    data: params,
+    contentType: ContentTypeEnum.FORM_URLENCODED
+  })
+}
+
+
+// 修改保存
+export function updateApi(params) {
+  return request({
+    url: baseUrl,
+    method: 'put',
+    data: params,
+    contentType: ContentTypeEnum.FORM_URLENCODED
+  })
+}
+
+
+// 检查发货计划是否可以填写实发数
+// [id1, id2, ...]
+export function checkApi(ids) {
+  return request({
+    url: baseUrl + '/check',
+    method: 'post',
+    data: ids,
+    contentType: ContentTypeEnum.JSON
+  })
+}
+
+// 根据发货计划ID查询发货订单列表
+export function listByShipmentOrderId(shipmentsOrderId) {
+  return request({
+    url:  baseUrl + '/listByShipmentOrderId',
+    method: 'get',
+    params: { shipmentsOrderId }
+  })
+}
+
+// 根据发货计划ID查询发货订单列表
+// {
+//   id,
+//   detailList,
+//   type,
+// }
+export function dataReplenishInput(params) {
+  return request({
+    url: baseUrl + '/dataReplenishInput',
+    method: 'post',
+    data: params,
+    contentType: ContentTypeEnum.JSON
+  })
+}
+
+// 保存签收单
+// {
+//   fileId: String;
+//   fileName: String;
+//   shipmentsOrderId: String;
+// }
+export function saveSignInTicket(params) {
+  return request({
+    url: baseUrl + '/saveSignInTicket',
+    method: 'get',
+    params: params,
+  })
+}
+
+// 查询发货计划详情
+export function queryDetail(params) {
+  return request({
+    url: '/shipments/plan/detail/query',
+    method: 'get',
+    params: params,
+  })
+}
+
+// 发货单-拆分
+export function splitDataApi(params) {
+  return request({
+    url: '/shipments/plan/detail/split',
+    method: 'post',
+    data: params,
+    contentType: ContentTypeEnum.JSON
+  })
+}

+import request from '@/utils/request'
+import { ContentTypeEnum } from '@/utils/httpEnum';
+
+const baseUrl = '/shipments/replenishmentOrder';
+// 查询列表
+export function queryApi(params) {
+  return request({
+    url: baseUrl + `/query`,
+    method: 'get',
+    params
+  })
+}
+
+// 根据ID查询详情数据
+export function getDetailApi(id) {
+  return request({
+    url:  baseUrl,
+    method: 'get',
+    params: { id }
+  })
+}
+
+// 获取订单编号
+export function getCodeApi(purchaseOrderId) {
+  return request({
+    url:  baseUrl + '/getCode',
+    method: 'get',
+    params: { purchaseOrderId }
+  })
+}
+
+
+// 取消
+export function cancelApi(id) {
+  return request({
+    url:  baseUrl + '/cancel',
+    method: 'get',
+    params: { id }
+  })
+}
+
+// 新增保存
+export function createApi(params) {
+  return request({
+    url: baseUrl,
+    method: 'post',
+    data: params,
+    contentType: ContentTypeEnum.JSON
+  })
+}
+
+
+// 填写计划补货时间
+export function fillRestockTimeApi(params) {
+  return request({
+    url: baseUrl + '/fillRestockTime',
+    method: 'post',
+    data: params,
+    contentType: ContentTypeEnum.JSON
+  })
+}
+
+
+// 修改保存
+export function updateApi(params) {
+  return request({
+    url: baseUrl,
+    method: 'put',
+    data: params,
+    contentType: ContentTypeEnum.JSON
+  })
+}
+
+// 通过订单ID 补货单-获取订货单列表
+export function loadOrderApi(ids) {
+  return request({
+    url: `/selector/replenishment/order/load`,
+    method: 'post',
+    data: ids,
+    contentType: ContentTypeEnum.JSON
+  })
+}

@@ -4,9 +4,6 @@
       class="scroll"
       class="scroll"
       scroll-y
       scroll-y
       :lower-threshold="lowerThreshold"
       :lower-threshold="lowerThreshold"
-      :refresher-enabled="enableRefresh"
-      :refresher-triggered="refresherTriggered"
-      @refresherrefresh="onRefresh"
       @scrolltolower="onLoadMore"
       @scrolltolower="onLoadMore"
       @scroll="onScroll"
       @scroll="onScroll"
     >
     >

@@ -52,10 +52,10 @@
                 }}</text></view>
                 }}</text></view>
             </view>
             </view>
 
 
-            <view class="section" v-if="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 ?
+            <view class="section" v-if="detail.status === 'FORMAL'">
+                <view class="row"><text class="label">正式规范性合同</text><text class="value act" @click="downloadFile(detail.formalFileId, detail.formalFileName)">{{
+                    detail.formalFileName || '-' }}</text></view>
+                <view class="row"><text class="label">正式合同是否规范</text><text class="value">{{ detail.formalStandardized ?
                         '是' : '否' }}</text></view>
                         '是' : '否' }}</text></view>
             </view>
             </view>
 
 
@@ -80,6 +80,7 @@
 <script>
 <script>
 import { getContractApi } from '@/api/contract'
 import { getContractApi } from '@/api/contract'
 import ProductRel from './productRel.vue'
 import ProductRel from './productRel.vue'
+import { downloadFile } from '@/utils/downloadFile.js'
 
 
 export default {
 export default {
     name: 'FormalContractViewer',
     name: 'FormalContractViewer',
@@ -160,6 +161,7 @@ export default {
                 this.productList = lines
                 this.productList = lines
             }).catch(() => { })
             }).catch(() => { })
         },
         },
+        downloadFile,
         getFormValues() {
         getFormValues() {
             const m = this.detail || {}
             const m = this.detail || {}
             return JSON.parse(JSON.stringify(m))
             return JSON.parse(JSON.stringify(m))
@@ -205,7 +207,8 @@ export default {
 }
 }
 
 
 .label {
 .label {
-    width: 280rpx;
+    max-width: 280rpx;
+    margin-right: 20rpx;
     color: rgba(0, 0, 0, 0.6);
     color: rgba(0, 0, 0, 0.6);
     font-size: 28rpx;
     font-size: 28rpx;
 }
 }
@@ -219,7 +222,8 @@ export default {
 }
 }
 
 
 .label1 {
 .label1 {
-    width: 280rpx;
+    max-width: 280rpx;
+    margin-right: 20rpx;
     color: rgba(0, 0, 0, 0.6);
     color: rgba(0, 0, 0, 0.6);
     font-size: 32rpx;
     font-size: 32rpx;
 }
 }
@@ -229,6 +233,13 @@ export default {
     text-align: right;
     text-align: right;
     color: rgba(0, 0, 0, 0.9);
     color: rgba(0, 0, 0, 0.9);
     font-size: 28rpx;
     font-size: 28rpx;
+    text-align: right;
+    word-break: break-all;
+
+    &.act {
+      color: $theme-primary;
+    }
+
 }
 }
 
 
 .customer {
 .customer {

@@ -119,12 +119,12 @@
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="不含税金额">
                     <uni-list-item title="不含税金额">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.amountExcludingTax" type="number" :inputBorder="false" disabled placeholder="自动计算" />
+                            <uni-easyinput v-model="item.amountExcludingTax" type="number" :inputBorder="false" disabled placeholder="" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="总金额">
                     <uni-list-item title="总金额">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.totalAmount" type="number" :inputBorder="false" disabled placeholder="自动计算" />
+                            <uni-easyinput v-model="item.totalAmount" type="number" :inputBorder="false" disabled placeholder="" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="发货日期">
                     <uni-list-item title="发货日期">
@@ -153,28 +153,32 @@
                 <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.quality }}</text></view>
                     <!-- 厚（公差） * 宽（公差） * 长（公差） -->
                     <!-- 厚（公差） * 宽（公差） * 长（公差） -->
                     <view class="row row-spec"><text class="label">规格(mm)</text>
                     <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 class="value value-spec">
+                        <view v-if="item.thickness" class="value-spec_val">{{ item.thickness }}</view>
+                        <view v-if="item.thickness" class="value-spec_box">
+                            <view v-if="item.thicknessTolPos" class="value-spec_box_1">{{ item.thicknessTolPos > 0 ? '+' + item.thicknessTolPos : item.thicknessTolPos }}
                             </view>
                             </view>
-                            <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 v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg > 0 ? '+' + item.thicknessTolNeg : item.thicknessTolNeg }}
                             </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 v-if="item.width" class="value-spec_val p12">*</view>
+                        <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
+                        <view v-if="item.width" class="value-spec_box">
+                            <view v-if="item.widthTolPos" class="value-spec_box_1">{{ item.widthTolPos > 0 ? '+' + item.widthTolPos : item.widthTolPos }}
+                            </view>
+                            <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg > 0 ? '+' + item.widthTolNeg : item.widthTolNeg }}
+                            </view>
+                        </view>
+                        <view v-if="item.length" class="value-spec_val p12">*</view>
+                        <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
+                        <view v-if="item.length" class="value-spec_box">
+                            <view v-if="item.lengthTolPos" class="value-spec_box_1">{{ item.lengthTolPos > 0 ? '+' + item.lengthTolPos : item.lengthTolPos }}
+                            </view>
+                            <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg > 0 ? '+' + item.lengthTolNeg : item.lengthTolNeg }}
                             </view>
                             </view>
                         </view>
                         </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.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">{{ item.quantity }}</text></view>
                 <view class="row"><text class="label">单价</text><text class="value">{{ formatCurrency(item.unitPrice)
                 <view class="row"><text class="label">单价</text><text class="value">{{ formatCurrency(item.unitPrice)

@@ -52,8 +52,8 @@
                 }}</text></view>
                 }}</text></view>
             </view>
             </view>
 
 
-            <view class="section" v-if="status === 'STANDARD'">
-                <view class="row"><text class="label">标准规范性合同</text><text class="value" style="color: #3D48A3;">{{
+            <view class="section" v-if="detail.status === 'STANDARD'">
+                <view class="row"><text class="label">标准规范性合同</text><text class="value act" @click="downloadFile(detail.standardFileId, detail.standardFileName)">{{
                     detail.standardFileName || '-' }}</text></view>
                     detail.standardFileName || '-' }}</text></view>
                 <view class="row"><text class="label">标准合同是否规范</text><text class="value">{{ detail.standardStandardized ?
                 <view class="row"><text class="label">标准合同是否规范</text><text class="value">{{ detail.standardStandardized ?
                         '是' : '否' }}</text></view>
                         '是' : '否' }}</text></view>
@@ -80,6 +80,7 @@
 <script>
 <script>
 import { getContractApi } from '@/api/contract'
 import { getContractApi } from '@/api/contract'
 import ProductRel from './productRel.vue'
 import ProductRel from './productRel.vue'
+import { downloadFile } from '@/utils/downloadFile.js'
 
 
 export default {
 export default {
     name: 'StandardContractViewer',
     name: 'StandardContractViewer',
@@ -160,6 +161,7 @@ export default {
                 this.productList = lines
                 this.productList = lines
             }).catch(() => { })
             }).catch(() => { })
         },
         },
+        downloadFile,
         getFormValues() {
         getFormValues() {
             const m = this.detail || {}
             const m = this.detail || {}
             return JSON.parse(JSON.stringify(m))
             return JSON.parse(JSON.stringify(m))
@@ -205,7 +207,8 @@ export default {
 }
 }
 
 
 .label {
 .label {
-    width: 280rpx;
+    max-width: 280rpx;
+    margin-right: 20rpx;
     color: rgba(0, 0, 0, 0.6);
     color: rgba(0, 0, 0, 0.6);
     font-size: 28rpx;
     font-size: 28rpx;
 }
 }
@@ -219,7 +222,8 @@ export default {
 }
 }
 
 
 .label1 {
 .label1 {
-    width: 280rpx;
+    max-width: 280rpx;
+    margin-right: 20rpx;
     color: rgba(0, 0, 0, 0.6);
     color: rgba(0, 0, 0, 0.6);
     font-size: 32rpx;
     font-size: 32rpx;
 }
 }
@@ -228,7 +232,12 @@ export default {
     flex: 1;
     flex: 1;
     text-align: right;
     text-align: right;
     color: rgba(0, 0, 0, 0.9);
     color: rgba(0, 0, 0, 0.9);
-    font-size: 28rpx;
+    font-size: 28rpx; text-align: right;
+    word-break: break-all;
+
+    &.act {
+      color: $theme-primary;
+    }
 }
 }
 
 
 .customer {
 .customer {

 <template>
 <template>
-  <view class="button-bar">
+  <view v-if="effectiveButtons.length" class="button-bar">
     <view v-if="showMoreButton" class="more-link" @click="toggleMore">更多</view>
     <view v-if="showMoreButton" class="more-link" @click="toggleMore">更多</view>
     <view class="button-grid" :style="{ gridTemplateColumns: gridColumns }">
     <view class="button-grid" :style="{ gridTemplateColumns: gridColumns }">
       <view v-for="(btn, idx) in visibleButtons" :key="idx" class="action-button" :class="buttonClass(btn)" :style="buttonStyle(btn)" @click="emitClick(btn)">{{ btn.text }}</view>
       <view v-for="(btn, idx) in visibleButtons" :key="idx" class="action-button" :class="buttonClass(btn)" :style="buttonStyle(btn)" @click="emitClick(btn)">{{ btn.text }}</view>

@@ -111,5 +111,7 @@ export default {
 .file-name { 
 .file-name { 
   font-size: 28rpx; color: rgba(0,0,0,0.9); 
   font-size: 28rpx; color: rgba(0,0,0,0.9); 
   line-height: 40rpx;
   line-height: 40rpx;
+   white-space: pre-wrap;
+    word-break: break-all;
   }
   }
 </style>
 </style>

@@ -3,7 +3,7 @@
     <view class="filter-modal">
     <view class="filter-modal">
       <view class="header">
       <view class="header">
         <text class="title">{{ title }}</text>
         <text class="title">{{ title }}</text>
-        <text class="close" @click="onClose">×</text>
+        <text class="close" @click="onClose"></text>
       </view>
       </view>
 
 
       <view class="body">
       <view class="body">
@@ -110,8 +110,12 @@ export default {
   text-align: center;
   text-align: center;
 }
 }
 .close {
 .close {
-  font-size: 36rpx;
-  color: #666;
+  width: 48rpx;
+	height: 48rpx;
+	background-image: url('~@/static/images/flow/close_icon.png');
+	background-repeat: no-repeat;
+	background-position: right center;
+	background-size: cover;
 }
 }
 .body {
 .body {
   flex: 1 1 auto;
   flex: 1 1 auto;
@@ -143,4 +147,11 @@ export default {
   background: $theme-primary;
   background: $theme-primary;
   color: #fff;
   color: #fff;
 }
 }
+
+.uni-input-placeholder, .uni-input-input {
+  font-size: 32rpx !important;
+}
+.uni-input-placeholder {
+  color: rgba(0, 0, 0, 0.4) !important;
+}
 </style>
 </style>

+<template>
+  <uni-popup ref="popup" type="bottom" :mask-click="false" :safe-area="true">
+    <view class="sheet">
+      <view class="sheet-header">
+        <text class="cancel" @click="onCancel">取消</text>
+        <text class="title">{{ title }}</text>
+        <text class="ok" @click="onConfirm">确认</text>
+      </view>
+      <view class="sheet-body">
+        <view
+          v-for="(opt, i) in options"
+          :key="i"
+          :class="['option', { selected: isSelected(opt) }]"
+          @click="toggle(opt)"
+        >
+          <text class="label">{{ displayOf(opt) }}</text>
+        </view>
+      </view>
+    </view>
+  </uni-popup>
+</template>
+
+<script>
+export default {
+  name: 'MultiSelectSheet',
+  props: {
+    visible: { type: Boolean, default: false },
+    title: { type: String, default: '请选择' },
+    // 统一约定：options 为 [{ label: string, value: string|number }]
+    options: { type: Array, default: () => [] },
+    // 接收逗号分隔的字符串 '111,222,333'
+    value: { type: String, default: '' }
+  },
+  data() {
+    return {
+      innerValue: [] // 内部维护数组形式
+    }
+  },
+  watch: {
+    value(v) { this.initInnerValue(v) },
+    visible(v) { v ? this.open() : this.close() }
+  },
+  mounted() {
+    if (this.visible) this.open()
+  },
+  methods: {
+    initInnerValue(val) {
+      if (!val) {
+        this.innerValue = []
+      } else {
+        this.innerValue = String(val).split(',').filter(x => x)
+      }
+    },
+    open() {
+      this.initInnerValue(this.value)
+      this.$refs.popup && this.$refs.popup.open()
+      this.$emit('update:visible', true)
+    },
+    close() {
+      this.$refs.popup && this.$refs.popup.close()
+      this.$emit('update:visible', false)
+    },
+    displayOf(opt) {
+      if (!opt) return ''
+      return opt.label != null ? String(opt.label) : ''
+    },
+    valueOf(opt) {
+      if (!opt) return ''
+      return opt.value != null ? String(opt.value) : ''
+    },
+    isSelected(opt) {
+      const v = this.valueOf(opt)
+      return this.innerValue.includes(v)
+    },
+    toggle(opt) {
+      const v = this.valueOf(opt)
+      const idx = this.innerValue.indexOf(v)
+      if (idx > -1) {
+        this.innerValue.splice(idx, 1)
+      } else {
+        this.innerValue.push(v)
+      }
+    },
+    onCancel() {
+      this.close()
+      this.$emit('cancel')
+    },
+    onConfirm() {
+      const selectedValues = this.innerValue
+      // 保持原始选项顺序
+      const sortedValues = []
+      const sortedLabels = []
+      
+      this.options.forEach(opt => {
+        const v = this.valueOf(opt)
+        if (selectedValues.includes(v)) {
+          sortedValues.push(v)
+          sortedLabels.push(this.displayOf(opt))
+        }
+      })
+
+      const valStr = sortedValues.join(',')
+      const labelStr = sortedLabels.join(',')
+      
+      this.$emit('confirm', { value: valStr, label: labelStr })
+      this.$emit('input', valStr)
+      this.$emit('update:value', valStr)
+      this.close()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.sheet {
+  width: 100%;
+  max-height: 45vh;
+  background: #fff;
+  border-radius: 20rpx 20rpx 0 0;
+  display: flex;
+  flex-direction: column;
+}
+.sheet-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 30rpx 32rpx;
+  border-bottom: 1rpx solid #f0f0f0;
+}
+.title {
+  font-size: 36rpx;
+  font-weight: 600;
+}
+.cancel {
+  color: rgba(0,0,0,0.6);
+  font-size: 28rpx;
+}
+.ok {
+  color: $theme-primary;
+  font-size: 28rpx;
+}
+.sheet-body {
+  flex: 1 1 auto;
+  overflow-y: auto;
+  padding: 32rpx;
+}
+.option {
+  padding: 20rpx;
+  line-height: 40rpx;
+  background: #fff;
+  text-align: center;
+  border-radius: 12rpx;
+  font-size: 32rpx;
+  margin-bottom: 20rpx;
+  .label {
+    color: rgba(0,0,0,0.6);
+    font-size: 32rpx;
+  }
+  &.selected {
+    background: #f3f3f3;
+    .label {
+      color: rgba(0,0,0,0.9);
+    }
+  }
+}
+</style>

@@ -129,7 +129,7 @@ export default {
         if (this.source === 'customer') {
         if (this.source === 'customer') {
           console.log('customer_extra', extra)
           console.log('customer_extra', extra)
           const source = (extra && extra.source) || '';
           const source = (extra && extra.source) || '';
-          const params = { pageIndex, pageSize, name, source }
+          const params = { pageIndex, pageSize, name, source, available: true }
           return customerQueryApi(params).then(res => {
           return customerQueryApi(params).then(res => {
             const _data = res.data || {}
             const _data = res.data || {}
             const records = _data.datas || []
             const records = _data.datas || []
@@ -139,7 +139,7 @@ export default {
           })
           })
         } else if (this.source === 'user') {
         } else if (this.source === 'user') {
           // 人员表
           // 人员表
-          const params = { pageIndex, pageSize, name }
+          const params = { pageIndex, pageSize, name, available: true }
           return userSelector(params).then(res => {
           return userSelector(params).then(res => {
             const _data = res.data || {}
             const _data = res.data || {}
             const records = _data.datas || _data.records || _data.list || []
             const records = _data.datas || _data.records || _data.list || []
@@ -149,9 +149,10 @@ export default {
           })
           })
         } else if (this.source === 'orderAssoc') {
         } else if (this.source === 'orderAssoc') {
           console.log('orderAssoc_extra', extra)
           console.log('orderAssoc_extra', extra)
-          // 订单关联表（可撤销/变更的订货单）
+          // 订单关联表（可撤销/变更的订货单、可发货的订货单）
+          // 支持 订单编号&订货单位 模糊搜索  searchKey
           const queryType = (extra && extra.queryType) || ''
           const queryType = (extra && extra.queryType) || ''
-          const params = { pageIndex, pageSize, orderNo: name, queryType }
+          const params = { pageIndex, pageSize, searchKey: name, queryType }
           return listCanRevokeOrChangeOrderInfo(params).then(res => {
           return listCanRevokeOrChangeOrderInfo(params).then(res => {
             const _data = res.data || {}
             const _data = res.data || {}
             const records = _data.datas || _data.records || _data.list || []
             const records = _data.datas || _data.records || _data.list || []
@@ -233,13 +234,13 @@ export default {
 .cancel { color: rgba(0,0,0,0.6); font-size: 28rpx; }
 .cancel { color: rgba(0,0,0,0.6); font-size: 28rpx; }
 .ok { color: $theme-primary; font-size: 28rpx; }
 .ok { color: $theme-primary; font-size: 28rpx; }
 .sheet-search { padding: 16rpx 24rpx; }
 .sheet-search { padding: 16rpx 24rpx; }
-.sheet-body { 
-  flex: 1 1 auto; overflow-y: auto; padding: 24rpx; 
+.sheet-body {
+  flex: 1 1 auto; overflow-y: auto; padding: 24rpx;
   background: #f3f3f3;
   background: #f3f3f3;
 }
 }
 .card { background: #fff; }
 .card { background: #fff; }
-.card.selected { 
-  background-color: #fff; 
+.card.selected {
+  background-color: #fff;
   position: relative;
   position: relative;
   &::after {
   &::after {
     content: '';
     content: '';

@@ -656,6 +656,134 @@
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 				"navigationBarTextStyle": "black"
 			}
 			}
+		},
+		{
+			"path": "pages/invoice/index",
+			"style": {
+				"navigationBarTitleText": "发货单",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/invoice/detail",
+			"style": {
+				"navigationBarTitleText": "发货单详情",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/invoice/fill",
+			"style": {
+				"navigationBarTitleText": "发货单填写实发数",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/delay_invoice/index",
+			"style": {
+				"navigationBarTitleText": "延期发货单",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/delay_invoice/detail",
+			"style": {
+				"navigationBarTitleText": "延期发货单详情",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/delay_invoice/modify",
+			"style": {
+				"navigationBarTitleText": "编辑延期发货单",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/draft_order/index",
+			"style": {
+				"navigationBarTitleText": "草稿要车单",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/draft_order/detail",
+			"style": {
+				"navigationBarTitleText": "草稿要车单详情",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/draft_order/modify",
+			"style": {
+				"navigationBarTitleText": "编辑草稿要车单",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/car_request_order/index",
+			"style": {
+				"navigationBarTitleText": "要车单",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/car_request_order/detail",
+			"style": {
+				"navigationBarTitleText": "要车单详情",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/replenishment_order/index",
+			"style": {
+				"navigationBarTitleText": "补货单",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/replenishment_order/add",
+			"style": {
+				"navigationBarTitleText": "新增补货单",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/replenishment_order/detail",
+			"style": {
+				"navigationBarTitleText": "补货单详情",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/replenishment_order/modify",
+			"style": {
+				"navigationBarTitleText": "编辑补货单",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/replenishment_order/fill",
+			"style": {
+				"navigationBarTitleText": "填写补货时间",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
 		}
 		}
 	],
 	],
 	"subPackages": [
 	"subPackages": [

+<template>
+  <view class="page">
+    <scroll-view class="scroll" scroll-y>
+      <view class="detail-page">
+        <view class="section">
+          <text class="row company">{{ form.orderingUnitName }}</text>
+          <view class="row"><text class="label">要车日期</text><text class="value">{{ form.requestCarDate }}</text></view>
+          <view class="row"><text class="label">要车办事处</text><text class="value">{{ form.deptName }}</text></view>
+          <view class="row"><text class="label">计划装货日期</text><text class="value">{{ form.deliveryDate }}</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.orderNo }}</text></view>
+          <view class="row"><text class="label">卸货地点</text><text class="value">{{ form.destination }}</text></view>
+          <view class="row"><text class="label">计划吨位(kg)</text><text class="value">{{ form.quantity }}</text></view>
+          <view class="row"><text class="label">接货人/联络人</text><text class="value">{{ form.consignee }}</text></view>
+          <view class="row"><text class="label">联系电话</text><text class="value">{{ form.phone }}</text></view>
+          <view class="row"><text class="label">装货时间</text><text class="value">{{ form.loadingTime }}</text></view>
+          <view class="row"><text class="label">外办审核人</text><text class="value">{{ form.externalAuditorName }}</text></view>
+          <view class="row"><text class="label">经营办审核人</text><text class="value">{{ form.businessOfficeAuditorName }}</text></view>
+          <view class="row"><text class="label">运作科审核人</text><text class="value">{{ form.operationsDepartmentAuditorName }}</text></view>
+          <view class="row"><text class="label">回货计划安排</text><text class="value">{{ form.returnPlanArrangement }}</text></view>
+          <view class="row"><text class="label">特殊需求、其他等</text><text class="value">{{ form.other }}</text></view>
+          <view class="row"><text class="label">装货特别要求/需求</text><text class="value">{{ form.specialLoadingRequirement }}</text></view>
+        </view>
+      </view>
+    </scroll-view>
+  </view>
+</template>
+
+<script>
+import { getDetailApi } from '@/api/car_request_order.js'
+
+export default {
+  name: 'CarRequestOrderDetail',
+  data() {
+    return {
+      form: {},
+    }
+  },
+  computed: {
+  },
+  onLoad(query) {
+    const id = (query && (query.id || query.code)) || ''
+    if (id) this.loadDetail(id)
+  },
+  methods: {
+    async loadDetail(id) {
+      try {
+        const res = await getDetailApi(id)
+        this.form = res.data || {}
+      } catch (e) {
+        this.form = {}
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.page {
+  display: flex;
+  flex-direction: column;
+  height: 100vh;
+}
+
+.scroll {
+  flex: 1;
+  background: #f3f3f3;
+}
+
+.detail-page {
+}
+
+.section {
+  padding: 32rpx;
+  background: #fff;
+  margin-bottom: 20rpx;
+  position: relative;
+}
+
+.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);
+    padding-top: 10rpx;
+    margin-bottom: 32rpx;
+    line-height: 50rpx;
+  }
+
+  .label {
+    width: 240rpx;
+    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;
+    word-break: break-all;
+  }
+}
+
+.title-header {
+  background-color: #fff;
+  display: flex;
+  align-items: center;
+  padding: 32rpx 32rpx 22rpx;
+  border-bottom: 1rpx dashed #f0f0f0;
+
+  &_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;
+  }
+}
+</style>

+<template>
+	<view class="page">
+		<view class="dev-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, selected }">
+					<view class="card" @click.stop="onCardClick(item)">
+						<view class="card-header">
+							<text class="title omit2">{{ item.orderingUnitName }}</text>
+						</view>
+						<view class="info-row">
+							<text>订单编号</text><text>{{ item.orderNo || '-' }}</text>
+						</view>
+						<view class="info-row">
+							<text>要车办事处</text><text>{{ item.deptName || '-' }}</text>
+						</view>
+						<view class="info-row">
+							<text>装货厂别</text><text>{{ item.workshopName || '-' }}</text>
+						</view>
+						<view class="info-row">
+							<text>要车日期</text><text>{{ item.requestCarDate || '-' }}</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-easyinput v-model="model.deptName" placeholder="请输入办事处" :inputBorder="false"
+							placeholderStyle="font-size:14px" @input="onDeptNameInput" />
+					</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.workshopId" @change="onWorkshopChange" :localdata="workshopOptions" />
+					</view>
+
+					<view class="form-item">
+						<view class="label">要车日期</view>
+						<uni-datetime-picker type="daterange" v-model="model.dateRange" start="2023-01-01" @change="onDateChange($event, model)" />
+					</view>
+				</view>
+			</template>
+		</filter-modal>
+	</view>
+</template>
+
+<script>
+import CardList from '@/components/card/index.vue'
+import FilterModal from '@/components/filter/index.vue'
+import { workshopQueryApi } from '@/api/devManage.js'
+import SingleSelectSheet from '@/components/single-select/index.vue'
+import {
+	queryApi
+} from '@/api/car_request_order.js'
+import {
+	getDicByCodes
+} from '@/utils/dic'
+import {
+	getDicName
+} from '@/utils/dic.js'
+
+export default {
+	components: {
+		CardList,
+		FilterModal,
+		SingleSelectSheet
+	},
+	data() {
+		return {
+			searchKeyword: '',
+			searchKeywordDebounced: '',
+			tabs: [],
+			// 给到 card 的筛选值
+			query: {
+				status: '',
+				companySuggestedCategory: '',
+				dateRange: []
+			},
+			extraParams: {},
+
+			// 批量选择
+			rowKey: 'id',
+			currentItems: [],
+
+			// 筛选弹框
+			filterVisible: false,
+			filterForm: {
+				status: '',
+				dateRange: []
+			},
+			dicOptions: {
+				SHIP_ORDER_STATUS: [],
+			},
+			statusLocal: [],
+			workshopOptions: [],
+		}
+	},
+	computed: {
+		extraCombined() {
+			return {
+				searchKey: this.searchKeywordDebounced || undefined
+			}
+		}
+	},
+	watch: {
+		extraCombined: {
+			deep: true,
+			handler(v) {
+				this.extraParams = v
+			},
+			immediate: true
+		},
+
+	},
+	created() {
+		this.loadWorkshopOptions()
+	},
+	onLoad() { },
+	// 页面触底兜底：当页面自身滚动到底部时，转调卡片组件加载更多
+	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: {
+		async loadWorkshopOptions() {
+			try {
+				const res = await workshopQueryApi({ pageIndex: 1, pageSize: 9999 })
+				const list = (res && res.data && res.data.datas) || []
+				this.workshopOptions = list.map(it => ({ text: it.name || it.workshopName || '', value: it.id || it.workshopId || '' }))
+			} catch (e) {
+				this.workshopOptions = []
+			}
+		},
+		onCardLoaded({
+			items
+		}) {
+			this.currentItems = items
+		},
+		onCardError() {
+			uni.showToast({
+				title: '列表加载失败',
+				icon: 'none'
+			})
+		},
+		// 输入实时搜索：1200ms 防抖，仅在停止输入超过阈值后刷新
+		onSearchInput(val) {
+			if (this.searchDebounceTimer) clearTimeout(this.searchDebounceTimer)
+			this.searchDebounceTimer = setTimeout(() => {
+				this.searchKeywordDebounced = this.searchKeyword
+				this.searchDebounceTimer = null
+			}, 1200)
+		},
+		// uni-search-bar 确认搜索：更新关键字并触发 CardList 刷新
+		search(e) {
+			const val = e && e.value != null ? e.value : this.searchKeyword
+			this.searchKeyword = val
+			this.searchKeywordDebounced = val
+		},
+		onAdd() {
+			uni.navigateTo({
+				url: '/pages/credit_manage/add'
+			})
+		},
+		openFilter() {
+			this.filterVisible = true
+		},
+		onFilterReset(payload) {
+			this.filterForm = payload
+		},
+		onFilterConfirm(payload) {
+			if ((payload.status === '' || payload.status == null) && this.filterForm.status !== '') {
+				payload.status = this.filterForm.status
+			}
+			this.query = {
+				...payload
+			}
+		},
+		onStatusChange(e) {
+			const raw = e && e.detail && e.detail.value !== undefined ?
+				e.detail.value :
+				(e && e.value !== undefined ? e.value : '')
+			this.filterForm.status = raw
+		},
+
+		// 列表接口（真实请求）
+		fetchList({
+			pageIndex,
+			pageSize,
+			query,
+			extra
+		}) {
+			const params = {
+				pageIndex,
+				pageSize,
+				...extra,
+				...query
+			}
+			if (Array.isArray(params.dateRange) && params.dateRange.length === 2) {
+				params.requestCarDateStart = params.dateRange[0]
+				params.requestCarDateEnd = params.dateRange[1]
+				delete params.dateRange
+			}
+			if (this.searchKeywordDebounced) {
+				params.searchKey = this.searchKeywordDebounced
+			}
+			return queryApi(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
+					}
+				})
+		},
+		onCardClick(item) {
+			const id = (item && (item.id || item.code)) || ''
+			if (!id) return
+			const query = '?id=' + encodeURIComponent(id)
+			uni.navigateTo({
+				url: '/pages/car_request_order/detail' + query
+			})
+		},
+		getDicName: getDicName,
+		getCategoryClass(categoryName) {
+			if (!categoryName) return ''
+			if (categoryName.includes('A') || categoryName.includes('a')) {
+				return 'category_A'
+			} else if (categoryName.includes('B') || categoryName.includes('b')) {
+				return 'category_B'
+			} else if (categoryName.includes('C') || categoryName.includes('c')) {
+				return 'category_C'
+			} else if (categoryName.includes('D') || categoryName.includes('d')) {
+				return 'category_D'
+			}
+		},
+		onDeptNameInput(val) {
+			this.filterForm.deptName = val
+		},
+		onWorkshopChange(e) {
+			const raw = e && e.detail && e.detail.value !== undefined ? e.detail.value : (e && e.value !== undefined ? e.value : '')
+			this.filterForm.workshopId = raw
+			const match = (this.workshopOptions || []).find(o => String(o.value) === String(raw))
+			this.filterForm.workshopIdName = match ? (match.text || '') : ''
+		},
+		 onDateChange(e, model) {
+			// 确保同步更新 filterForm，避免数据不同步
+			this.filterForm.dateRange = e
+		},
+
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.page {
+	display: flex;
+	flex-direction: column;
+	height: 100vh;
+}
+
+.dev-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: 140rpx;
+
+	&.pad-batch {
+		padding-bottom: 144rpx;
+	}
+
+	.card {
+		position: relative;
+	}
+
+	.card-header {
+		margin-bottom: 28rpx;
+		position: relative;
+
+		.title {
+			font-size: 36rpx;
+			font-weight: 600;
+			line-height: 50rpx;
+			color: rgba(0, 0, 0, 0.9);
+			width: 578rpx;
+		}
+
+		.status-box {
+			position: absolute;
+			top: -32rpx;
+			right: -12rpx;
+
+			.status {
+				display: block;
+				height: 48rpx;
+				line-height: 48rpx;
+				font-weight: 600;
+				color: #fff;
+				font-size: 24rpx;
+				padding: 0 14rpx;
+				border-radius: 6rpx;
+				margin-bottom: 8rpx;
+
+				// 已签收
+				&.status_DELIVERED {
+					background: #E7E7E7;
+					color: rgba(0, 0, 0, 0.9);
+				}
+
+				// 已发货
+				&.status_SHIPMENTS {
+					background: #2BA471;
+				}
+
+				// 未发货
+				&.status_UN_SHIPMENTS {
+					background: #D54941;
+				}
+			}
+
+			.status2 {
+				display: block;
+				font-weight: 600;
+				line-height: 48rpx;
+				height: 48rpx;
+				color: #fff;
+				font-size: 24rpx;
+				padding: 0 14rpx;
+				border-radius: 6rpx;
+				background: #E7E7E7;
+				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%;
+			}
+
+			&.category {
+				display: inline-block;
+				padding: 4rpx 12rpx;
+				border-radius: 6rpx;
+				font-size: 24rpx;
+				width: auto;
+
+				&.category_A {
+					background: #FFF0ED;
+					color: #D54941;
+				}
+
+				&.category_B {
+					background: #FFF1E9;
+					color: #E37318;
+				}
+
+				&.category_C {
+					background: #F2F3FF;
+					color: $theme-primary;
+				}
+
+				&.category_D {
+					background: #E3F9E9;
+					color: #2BA471;
+				}
+			}
+		}
+
+	}
+}
+
+.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>

@@ -393,7 +393,8 @@ export default {
         const v = Number(it && it.quantity)
         const v = Number(it && it.quantity)
         return acc + (isNaN(v) ? 0 : v)
         return acc + (isNaN(v) ? 0 : v)
       }, 0)
       }, 0)
-      this.form.afterTotalQuantity = sum
+       const fixedSum = Number(sum.toFixed(2))
+      this.form.afterTotalQuantity = fixedSum
     },
     },
   }
   }
 }
 }
@@ -622,7 +623,6 @@ export default {
       color: rgba(0, 0, 0, 0.9);
       color: rgba(0, 0, 0, 0.9);
       padding-bottom: 16rpx;
       padding-bottom: 16rpx;
       margin-bottom: 24rpx;
       margin-bottom: 24rpx;
-      ;
       border-bottom: 1px dashed #E7E7E7;
       border-bottom: 1px dashed #E7E7E7;
     }
     }
 
 
@@ -635,15 +635,16 @@ export default {
         width: 180rpx;
         width: 180rpx;
         margin-right: 14rpx;
         margin-right: 14rpx;
         color: rgba(0, 0, 0, 0.6);
         color: rgba(0, 0, 0, 0.6);
-        font-size: 28rpx;
+        font-size: 32rpx;
       }
       }
 
 
       .value {
       .value {
         flex: 1;
         flex: 1;
         color: rgba(0, 0, 0, 0.9);
         color: rgba(0, 0, 0, 0.9);
-        font-size: 28rpx;
+        font-size: 32rpx;
         white-space: pre-wrap;
         white-space: pre-wrap;
         word-break: break-all;
         word-break: break-all;
+        font-weight: 600;
       }
       }
     }
     }
   }
   }

@@ -24,7 +24,7 @@
         <view class="mgb10">
         <view class="mgb10">
           <Product title="变更后" mode="view" :list="form.afterChangeSpecList" :totalQuantity="form.afterTotalQuantity || 0" />
           <Product title="变更后" mode="view" :list="form.afterChangeSpecList" :totalQuantity="form.afterTotalQuantity || 0" />
         </view>
         </view>
-       
+
         <view class="section">
         <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.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.invoicingStatus }}</text></view>
@@ -34,7 +34,7 @@
           <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 class="row"><text class="label">变更说明</text><text class="value">{{ form.changeDescription }}</text></view>
           <view class="row"><text class="label">变更说明</text><text class="value">{{ form.changeDescription }}</text></view>
         </view>
         </view>
-        
+
         <view class="title-header">
         <view class="title-header">
           <image class="title-header_icon" src="/static/images/title.png" />
           <image class="title-header_icon" src="/static/images/title.png" />
           <span>具体质量要求</span>
           <span>具体质量要求</span>
@@ -171,7 +171,7 @@ export default {
               uni.showToast({ title: '已确认变更', icon: 'none' })
               uni.showToast({ title: '已确认变更', icon: 'none' })
               setTimeout(() => { uni.redirectTo({ url: '/pages/change_list/index' }) }, 300)
               setTimeout(() => { uni.redirectTo({ url: '/pages/change_list/index' }) }, 300)
             }).catch(() => {
             }).catch(() => {
-              uni.showToast({ title: '确认变更失败', icon: 'none' })  
+              uni.showToast({ title: '确认变更失败', icon: 'none' })
             })
             })
           }
           }
         }
         }
@@ -289,6 +289,7 @@ export default {
 
 
   .label {
   .label {
     max-width: 420rpx;
     max-width: 420rpx;
+    margin-right: 20rpx;
     line-height: 32rpx;
     line-height: 32rpx;
     font-size: 28rpx;
     font-size: 28rpx;
     color: rgba(0, 0, 0, 0.6);
     color: rgba(0, 0, 0, 0.6);
@@ -300,6 +301,8 @@ export default {
     font-size: 28rpx;
     font-size: 28rpx;
     color: rgba(0, 0, 0, 0.9);
     color: rgba(0, 0, 0, 0.9);
     text-align: right;
     text-align: right;
+    white-space: pre-wrap;
+    word-break: break-all;
 
 
     &.act {
     &.act {
       color: $theme-primary;
       color: $theme-primary;

@@ -228,7 +228,7 @@ export default {
 
 
 .list-box {
 .list-box {
   flex: 1;
   flex: 1;
-  padding: 120rpx 0 0;
+  padding: 140rpx 0 0;
 }
 }
 
 
 .card {
 .card {
@@ -250,7 +250,7 @@ export default {
       font-weight: 600;
       font-weight: 600;
       position: absolute;
       position: absolute;
       top: -32rpx;
       top: -32rpx;
-      right: -32rpx;
+      right: -12rpx;
       height: 48rpx;
       height: 48rpx;
       line-height: 48rpx;
       line-height: 48rpx;
       color: #fff;
       color: #fff;

@@ -312,7 +312,8 @@ export default {
         const v = Number(it && it.quantity)
         const v = Number(it && it.quantity)
         return acc + (isNaN(v) ? 0 : v)
         return acc + (isNaN(v) ? 0 : v)
       }, 0)
       }, 0)
-      this.form.afterTotalQuantity = sum
+      const fixedSum = Number(sum.toFixed(2));
+      this.form.afterTotalQuantity = fixedSum;
     },
     },
   }
   }
 }
 }
@@ -541,7 +542,6 @@ export default {
       color: rgba(0, 0, 0, 0.9);
       color: rgba(0, 0, 0, 0.9);
       padding-bottom: 16rpx;
       padding-bottom: 16rpx;
       margin-bottom: 24rpx;
       margin-bottom: 24rpx;
-      ;
       border-bottom: 1px dashed #E7E7E7;
       border-bottom: 1px dashed #E7E7E7;
     }
     }
 
 
@@ -554,15 +554,16 @@ export default {
         width: 180rpx;
         width: 180rpx;
         margin-right: 14rpx;
         margin-right: 14rpx;
         color: rgba(0, 0, 0, 0.6);
         color: rgba(0, 0, 0, 0.6);
-        font-size: 28rpx;
+        font-size: 32rpx;
       }
       }
 
 
       .value {
       .value {
         flex: 1;
         flex: 1;
         color: rgba(0, 0, 0, 0.9);
         color: rgba(0, 0, 0, 0.9);
-        font-size: 28rpx;
+        font-size: 32rpx;
         white-space: pre-wrap;
         white-space: pre-wrap;
         word-break: break-all;
         word-break: break-all;
+        font-weight: 600;
       }
       }
     }
     }
   }
   }

@@ -44,7 +44,7 @@
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="厚度公差上限(mm)">
                         <uni-list-item title="厚度公差上限(mm)">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput type="number" v-model="item.thicknessTolPos" placeholder="请输入厚度公差上限"
+                                <uni-easyinput type="digit" v-model="item.thicknessTolPos" placeholder="请输入厚度公差上限"
                                     :inputBorder="false"
                                     :inputBorder="false"
                                     @input="onRealNumberInput($event, item, idx, 'thicknessTolPos')"
                                     @input="onRealNumberInput($event, item, idx, 'thicknessTolPos')"
                                     @blur="onRealNumberBlur(item, idx, 'thicknessTolPos')" />
                                     @blur="onRealNumberBlur(item, idx, 'thicknessTolPos')" />
@@ -52,7 +52,7 @@
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="厚度公差下限(mm)">
                         <uni-list-item title="厚度公差下限(mm)">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput type="number" v-model="item.thicknessTolNeg" placeholder="请输入厚度公差下限"
+                                <uni-easyinput type="digit" v-model="item.thicknessTolNeg" placeholder="请输入厚度公差下限"
                                     :inputBorder="false"
                                     :inputBorder="false"
                                     @input="onRealNumberInput($event, item, idx, 'thicknessTolNeg')"
                                     @input="onRealNumberInput($event, item, idx, 'thicknessTolNeg')"
                                     @blur="onRealNumberBlur(item, idx, 'thicknessTolNeg')" />
                                     @blur="onRealNumberBlur(item, idx, 'thicknessTolNeg')" />
@@ -67,7 +67,7 @@
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="宽度公差上限(mm)">
                         <uni-list-item title="宽度公差上限(mm)">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput type="number" v-model="item.widthTolPos" placeholder="请输入宽度公差上限"
+                                <uni-easyinput type="digit" v-model="item.widthTolPos" placeholder="请输入宽度公差上限"
                                     :inputBorder="false"
                                     :inputBorder="false"
                                     @input="onRealNumberInput($event, item, idx, 'widthTolPos')"
                                     @input="onRealNumberInput($event, item, idx, 'widthTolPos')"
                                     @blur="onRealNumberBlur(item, idx, 'widthTolPos')" />
                                     @blur="onRealNumberBlur(item, idx, 'widthTolPos')" />
@@ -75,7 +75,7 @@
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="宽度公差下限(mm)">
                         <uni-list-item title="宽度公差下限(mm)">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput type="number" v-model="item.widthTolNeg" placeholder="请输入宽度公差下限"
+                                <uni-easyinput type="digit" v-model="item.widthTolNeg" placeholder="请输入宽度公差下限"
                                     :inputBorder="false"
                                     :inputBorder="false"
                                     @input="onRealNumberInput($event, item, idx, 'widthTolNeg')"
                                     @input="onRealNumberInput($event, item, idx, 'widthTolNeg')"
                                     @blur="onRealNumberBlur(item, idx, 'widthTolNeg')" />
                                     @blur="onRealNumberBlur(item, idx, 'widthTolNeg')" />
@@ -90,7 +90,7 @@
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="长度公差上限(mm)">
                         <uni-list-item title="长度公差上限(mm)">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput type="number" v-model="item.lengthTolPos" placeholder="请输入长度公差上限"
+                                <uni-easyinput type="digit" v-model="item.lengthTolPos" placeholder="请输入长度公差上限"
                                     :inputBorder="false"
                                     :inputBorder="false"
                                     @input="onRealNumberInput($event, item, idx, 'lengthTolPos')"
                                     @input="onRealNumberInput($event, item, idx, 'lengthTolPos')"
                                     @blur="onRealNumberBlur(item, idx, 'lengthTolPos')" />
                                     @blur="onRealNumberBlur(item, idx, 'lengthTolPos')" />
@@ -98,7 +98,7 @@
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="长度公差下限(mm)">
                         <uni-list-item title="长度公差下限(mm)">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput type="number" v-model="item.lengthTolNeg" placeholder="请输入长度公差下限"
+                                <uni-easyinput type="digit" v-model="item.lengthTolNeg" placeholder="请输入长度公差下限"
                                     :inputBorder="false"
                                     :inputBorder="false"
                                     @input="onRealNumberInput($event, item, idx, 'lengthTolNeg')"
                                     @input="onRealNumberInput($event, item, idx, 'lengthTolNeg')"
                                     @blur="onRealNumberBlur(item, idx, 'lengthTolNeg')" />
                                     @blur="onRealNumberBlur(item, idx, 'lengthTolNeg')" />
@@ -113,8 +113,9 @@
                             <template v-slot:footer>
                             <template v-slot:footer>
                                 <uni-easyinput type="digit" v-model="item.quantity" placeholder="请输入数量kg"
                                 <uni-easyinput type="digit" v-model="item.quantity" placeholder="请输入数量kg"
                                     :inputBorder="false"
                                     :inputBorder="false"
-                                    @input="onNonNegativeNumberInput($event, item, idx, 'quantity')"
-                                    @blur="onNonNegativeNumberBlur(item, idx, 'quantity')" />
+                                    @input="onTwoDecimalInput($event, item, idx, 'quantity')"
+                                    @blur="onTwoDecimalBlur(item, idx, 'quantity')"
+                                    />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item v-if="item.showSalesPrice" title="销售价格">
                         <uni-list-item v-if="item.showSalesPrice" title="销售价格">
@@ -380,6 +381,49 @@ export default {
             if (isNaN(n)) item[field] = ''
             if (isNaN(n)) item[field] = ''
             if (typeof idx === 'number') this.$set(this.items, idx, { ...item })
             if (typeof idx === 'number') this.$set(this.items, idx, { ...item })
         },
         },
+        // 限制输入为2位小数    
+        onTwoDecimalInput(val, item, idx, field) {
+            let v = String(val != null ? val : (item && item[field]) || '')
+            v = v.replace(/[^0-9.]/g, '')
+            v = v.replace(/(\..*)\./g, '$1')
+            
+            // Restrict to 2 decimal places
+            const decimalIndex = v.indexOf('.')
+            if (decimalIndex !== -1 && v.length > decimalIndex + 3) {
+                v = v.substring(0, decimalIndex + 3)
+            }
+
+            if (v.startsWith('.')) v = '0' + v
+            
+            // If the value was modified (truncated or cleaned)
+            if (String(val) !== v) {
+                // Hack: Temporarily set the dirty value to trigger Vue update mechanism
+                // This ensures that when we set the clean value back, Vue detects a change
+                item[field] = val
+                if (typeof idx === 'number') this.$set(this.items, idx, { ...item })
+                
+                // Then revert to the clean value asynchronously
+                setTimeout(() => {
+                    item[field] = v
+                    if (typeof idx === 'number') this.$set(this.items, idx, { ...item })
+                }, 0)
+            } else {
+                item[field] = v
+                if (typeof idx === 'number') this.$set(this.items, idx, { ...item })
+            }
+        },
+        onTwoDecimalBlur(item, idx, field) {
+            let v = String((item && item[field]) || '')
+            const num = Number(v)
+            if (isNaN(num) || num < 0) {
+                item[field] = '0'
+            } else {
+                if (v.endsWith('.')) {
+                    item[field] = v.slice(0, -1)
+                }
+            }
+            if (typeof idx === 'number') this.$set(this.items, idx, { ...item })
+        },
         toggleViewCollapse() {
         toggleViewCollapse() {
             this.collapsedView = !this.collapsedView
             this.collapsedView = !this.collapsedView
         },
         },
@@ -729,7 +773,6 @@ export default {
             color: rgba(0, 0, 0, 0.9);
             color: rgba(0, 0, 0, 0.9);
             padding-bottom: 16rpx;
             padding-bottom: 16rpx;
             margin-bottom: 24rpx;
             margin-bottom: 24rpx;
-            ;
             border-bottom: 1px dashed #E7E7E7;
             border-bottom: 1px dashed #E7E7E7;
         }
         }
 
 
@@ -846,7 +889,6 @@ export default {
             color: rgba(0, 0, 0, 0.9);
             color: rgba(0, 0, 0, 0.9);
             padding-bottom: 16rpx;
             padding-bottom: 16rpx;
             margin-bottom: 24rpx;
             margin-bottom: 24rpx;
-            ;
             border-bottom: 1px dashed #E7E7E7;
             border-bottom: 1px dashed #E7E7E7;
         }
         }
 
 

@@ -162,6 +162,7 @@ export default {
 
 
   .label {
   .label {
     max-width: 420rpx;
     max-width: 420rpx;
+    margin-right: 20rpx;
     line-height: 32rpx;
     line-height: 32rpx;
     font-size: 28rpx;
     font-size: 28rpx;
     color: rgba(0, 0, 0, 0.6);
     color: rgba(0, 0, 0, 0.6);

@@ -63,7 +63,7 @@
                 <ProductRel ref="productRel" mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" @change="onProductsChange" :options="productList" />
                 <ProductRel ref="productRel" mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" @change="onProductsChange" :options="productList" />
                 <uni-list-item title="合计人民币金额（大写）">
                 <uni-list-item title="合计人民币金额（大写）">
                     <template v-slot:footer>
                     <template v-slot:footer>
-                        <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false" disabled />
+                        <uni-easyinput v-model="form.totalAmountCapital" placeholder="" :inputBorder="false" disabled />
                     </template>
                     </template>
                 </uni-list-item>
                 </uni-list-item>
                 <uni-list-item title="交付定金、数额、时间">
                 <uni-list-item title="交付定金、数额、时间">
@@ -555,7 +555,7 @@ export default {
         async onSubmit() {
         async onSubmit() {
             if (!this.validateRequired()) return
             if (!this.validateRequired()) return
             const confirmRes = await new Promise(resolve => {
             const confirmRes = await new Promise(resolve => {
-                uni.showModal({ title: '提示', content: '确定新增经销未锁规合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
+                uni.showModal({ title: '提示', content: '确定新增外贸标准合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
             })
             })
             if (!(confirmRes && confirmRes.confirm)) return
             if (!(confirmRes && confirmRes.confirm)) return
             const clean = (obj) => {
             const clean = (obj) => {

@@ -59,8 +59,10 @@
                     <view class="row"><text class="label">备注</text><text class="value">{{ detail.remarks || '-'
                     <view class="row"><text class="label">备注</text><text class="value">{{ detail.remarks || '-'
                     }}</text></view>
                     }}</text></view>
                 </view>
                 </view>
-                <view class="section" v-if="status === 'STANDARD'">
-                    <view class="row"><text class="label">规范性合同</text><text class="value" style="color: #3D48A3;">{{
+                <view class="section" v-if="detail.status === 'STANDARD'">
+                    <view class="row"><text class="label">双方盖章合同</text><text class="value act" @click="downloadFile(detail.signedContractFileId, detail.signedContractFileName)">{{
+                        detail.signedContractFileName || '-' }}</text></view>
+                    <view class="row"><text class="label">规范性合同</text><text class="value act"  @click="downloadFile(detail.standardFileId, detail.standardFileName)">{{
                         detail.standardFileName || '-' }}</text></view>
                         detail.standardFileName || '-' }}</text></view>
                     <view class="row"><text class="label">合同是否规范</text><text class="value">{{
                     <view class="row"><text class="label">合同是否规范</text><text class="value">{{
                         detail.standardStandardized ? '是' : '否' }}</text></view>
                         detail.standardStandardized ? '是' : '否' }}</text></view>
@@ -119,6 +121,7 @@ import DetailButtons from '@/components/detail-buttons/index.vue'
 import FileUpload from '@/components/file-upload/index.vue'
 import FileUpload from '@/components/file-upload/index.vue'
 import SingleSelectSheet from '@/components/single-select/index.vue'
 import SingleSelectSheet from '@/components/single-select/index.vue'
 import { fillStandardApprovedName } from '@/utils/dic.js'
 import { fillStandardApprovedName } from '@/utils/dic.js'
+import { downloadFile } from '@/utils/downloadFile.js'
 
 
 export default {
 export default {
     name: 'ContractForeignStdDetail',
     name: 'ContractForeignStdDetail',
@@ -229,8 +232,8 @@ export default {
                 { ...this.buttons[1], visible: (s === 'DRAFT' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:delete')) },
                 { ...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[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[3], visible: (s === 'STANDARD' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:upload-seal')) },
+                { ...this.buttons[5], visible: (s === 'STANDARD' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:review')) },
                 { ...this.buttons[4], visible: (s === 'STANDARD' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:approve')) },
                 { ...this.buttons[4], visible: (s === 'STANDARD' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:approve')) },
-                { ...this.buttons[5], visible: (s === 'STANDARD' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:review')) }
             ]
             ]
         }
         }
     },
     },
@@ -296,7 +299,7 @@ export default {
                 })
                 })
                 return
                 return
             }
             }
-            if (!this.standardStandardized && this.uploadType === 'standard') {
+            if (!this.standardStandardized && this.standardStandardized !== false && this.uploadType === 'standard') {
                 uni.showToast({
                 uni.showToast({
                     title: '请选择合同是否规范',
                     title: '请选择合同是否规范',
                     icon: 'error'
                     icon: 'error'
@@ -374,6 +377,7 @@ export default {
             uni.setStorageSync(CACHE_KEY, this.getBusinessId())
             uni.setStorageSync(CACHE_KEY, this.getBusinessId())
             uni.navigateTo({ url: '/pages/flow/audit_detail' })
             uni.navigateTo({ url: '/pages/flow/audit_detail' })
         },
         },
+        downloadFile,
         async loadDetail() {
         async loadDetail() {
             if (!this.id) return
             if (!this.id) return
             try {
             try {
@@ -454,6 +458,10 @@ export default {
     &_已签收 {
     &_已签收 {
       background-image: url('~@/static/images/contract/status_4.png');
       background-image: url('~@/static/images/contract/status_4.png');
     }
     }
+
+    &_已取消 {
+      background-image: url('~@/static/images/contract/status_5.png');
+    }
   }
   }
 }
 }
 
 
@@ -473,7 +481,8 @@ export default {
 }
 }
 
 
 .label {
 .label {
-    width: 310rpx;
+    max-width: 310rpx;
+    margin-right: 20rpx;
     color: rgba(0, 0, 0, 0.6);
     color: rgba(0, 0, 0, 0.6);
     font-size: 28rpx;
     font-size: 28rpx;
 }
 }
@@ -483,8 +492,16 @@ export default {
     text-align: right;
     text-align: right;
     color: rgba(0, 0, 0, 0.9);
     color: rgba(0, 0, 0, 0.9);
     font-size: 28rpx;
     font-size: 28rpx;
+        white-space: pre-wrap;
+    word-break: break-all;
+    
 }
 }
 
 
+.act {
+        color: $theme-primary;
+    }
+
+
 .customer {
 .customer {
     font-weight: 600;
     font-weight: 600;
     font-size: 36rpx;
     font-size: 36rpx;
@@ -546,4 +563,7 @@ export default {
     color: rgba(0, 0, 0, 0.6);
     color: rgba(0, 0, 0, 0.6);
     font-size: 32rpx;
     font-size: 32rpx;
 }
 }
+.upload-row {
+    margin-top: 20rpx;
+}
 </style>
 </style>

@@ -49,7 +49,7 @@
           <view class="card" @click="goDetail(item)">
           <view class="card" @click="goDetail(item)">
             <view class="card-header">
             <view class="card-header">
               <text class="title omit2">{{ item.buyerName }}</text>
               <text class="title omit2">{{ item.buyerName }}</text>
-              <text v-if="item.status === 'STANDARD'" :class="['status']" :style="{ background: statusMap[item.shippingStatusName] }">{{ item.shippingStatusName }}</text>
+              <text v-if="item.status === 'STANDARD'" :class="['status', 'status_' + item.shippingStatusName]">{{ item.shippingStatusName }}</text>
             </view>
             </view>
             <view class="info-row">
             <view class="info-row">
               <text>编号</text><text>{{ item.code }}</text>
               <text>编号</text><text>{{ item.code }}</text>
@@ -94,8 +94,7 @@
 <script>
 <script>
 import CardList from '@/components/card/index.vue'
 import CardList from '@/components/card/index.vue'
 import FilterModal from '@/components/filter/index.vue'
 import FilterModal from '@/components/filter/index.vue'
-import { queryContractApi, statusStyle,statusMap } from '@/api/contract.js'
-import { officeQueryApi } from '@/api/devManage.js'
+import { queryContractApi, statusStyle } from '@/api/contract.js'
 
 
 export default {
 export default {
   components: { CardList, FilterModal },
   components: { CardList, FilterModal },
@@ -118,7 +117,6 @@ export default {
       filterForm: { deptId: '', deptName: '', dateRange: [] },
       filterForm: { deptId: '', deptName: '', dateRange: [] },
       deptSelectVisible: false,
       deptSelectVisible: false,
       statusStyle,
       statusStyle,
-      statusMap,
     }
     }
   },
   },
   computed: {
   computed: {
@@ -329,14 +327,31 @@ export default {
             font-size: 30rpx;
             font-size: 30rpx;
             font-weight: 600;
             font-weight: 600;
             position: absolute;
             position: absolute;
-            top: -36rpx;
-            right: -32rpx;
+            top: -32rpx;
+            right: -12rpx;
             height: 48rpx;
             height: 48rpx;
-            line-height: 48rpx;
+            line-height: 50rpx;
             color: #fff;
             color: #fff;
             font-size: 24rpx;
             font-size: 24rpx;
             padding: 0 14rpx;
             padding: 0 14rpx;
             border-radius: 6rpx;
             border-radius: 6rpx;
+            &_审批中 {
+                background: $theme-primary;
+            }
+            &_生产中 {
+                background: #2BA471;
+            }
+            &_已发货 {
+                background: #E37318;
+            }
+            &_已签收 {
+                background: #858A99;
+                color: #ffffff;
+            }
+            &_已取消 {
+                background: #9E9E9E;
+                color: #ffffff;
+            }
         }
         }
     }
     }
     .info-row {
     .info-row {
@@ -366,19 +381,19 @@ export default {
     }
     }
 }
 }
 
 
-.filter-form { 
+.filter-form {
     .form-item { margin-bottom: 24rpx; }
     .form-item { margin-bottom: 24rpx; }
-    .label { 
-        margin-bottom: 20rpx; 
+    .label {
+        margin-bottom: 20rpx;
         color: rgba(0,0,0,0.9);
         color: rgba(0,0,0,0.9);
         height: 44rpx;
         height: 44rpx;
         line-height: 44rpx;
         line-height: 44rpx;
         font-size: 30rpx;
         font-size: 30rpx;
      }
      }
-    .fake-select { 
-        height: 80rpx; line-height: 80rpx; padding: 0 20rpx; background: #f3f3f3; border-radius: 12rpx; 
+    .fake-select {
+        height: 80rpx; line-height: 80rpx; padding: 0 20rpx; background: #f3f3f3; border-radius: 12rpx;
         .placeholder { color: #999; }
         .placeholder { color: #999; }
         .value { color: #333; }
         .value { color: #333; }
     }
     }
 }
 }
-</style>
+</style>

@@ -65,7 +65,7 @@
                 <ProductRel ref="productRel" mode="add" :deliveryDateBase="form.deliveryDate" :deliveryDate="form.orderDate" :list="productLineList" @change="onProductsChange" :options="productList" />
                 <ProductRel ref="productRel" mode="add" :deliveryDateBase="form.deliveryDate" :deliveryDate="form.orderDate" :list="productLineList" @change="onProductsChange" :options="productList" />
                 <uni-list-item title="合计人民币金额（大写）">
                 <uni-list-item title="合计人民币金额（大写）">
                     <template v-slot:footer>
                     <template v-slot:footer>
-                        <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false"
+                        <uni-easyinput v-model="form.totalAmountCapital" placeholder="" :inputBorder="false"
                             disabled />
                             disabled />
                     </template>
                     </template>
                 </uni-list-item>
                 </uni-list-item>
@@ -531,7 +531,7 @@ export default {
             console.log('onSubmit__payload', payload)
             console.log('onSubmit__payload', payload)
             if (!this.validateRequired()) return
             if (!this.validateRequired()) return
             const confirmRes = await new Promise(resolve => {
             const confirmRes = await new Promise(resolve => {
-                uni.showModal({ title: '提示', content: '确定保存当前经销未锁规合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
+                uni.showModal({ title: '提示', content: '确定保存当前外贸标准合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
             })
             })
             if (!(confirmRes && confirmRes.confirm)) return
             if (!(confirmRes && confirmRes.confirm)) return
             const clean = (obj) => {
             const clean = (obj) => {

@@ -60,13 +60,13 @@
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="厚度公差上限(mm)">
                     <uni-list-item title="厚度公差上限(mm)">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput type="text" v-model="item.thicknessTolPos" :inputBorder="false"
+                            <uni-easyinput type="digit" v-model="item.thicknessTolPos" :inputBorder="false"
                                 placeholder="请输入厚度公差上限" @input="onNumberInput(idx, 'thicknessTolPos')" @blur="onNumberBlur(idx, 'thicknessTolPos', 9)" />
                                 placeholder="请输入厚度公差上限" @input="onNumberInput(idx, 'thicknessTolPos')" @blur="onNumberBlur(idx, 'thicknessTolPos', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="厚度公差下限(mm)">
                     <uni-list-item title="厚度公差下限(mm)">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput type="text" v-model="item.thicknessTolNeg" :inputBorder="false"
+                            <uni-easyinput type="digit" v-model="item.thicknessTolNeg" :inputBorder="false"
                                 placeholder="请输入厚度公差下限" @input="onNumberInput(idx, 'thicknessTolNeg')" @blur="onNumberBlur(idx, 'thicknessTolNeg', 9)" />
                                 placeholder="请输入厚度公差下限" @input="onNumberInput(idx, 'thicknessTolNeg')" @blur="onNumberBlur(idx, 'thicknessTolNeg', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
@@ -77,12 +77,12 @@
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="宽度公差上限(mm)">
                     <uni-list-item title="宽度公差上限(mm)">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput type="text" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差上限" @input="onNumberInput(idx, 'widthTolPos')" @blur="onNumberBlur(idx, 'widthTolPos', 9)" />
+                            <uni-easyinput type="digit" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差上限" @input="onNumberInput(idx, 'widthTolPos')" @blur="onNumberBlur(idx, 'widthTolPos', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="宽度公差下限(mm)">
                     <uni-list-item title="宽度公差下限(mm)">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput type="text" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差下限" @input="onNumberInput(idx, 'widthTolNeg')" @blur="onNumberBlur(idx, 'widthTolNeg', 9)" />
+                            <uni-easyinput type="digit" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差下限" @input="onNumberInput(idx, 'widthTolNeg')" @blur="onNumberBlur(idx, 'widthTolNeg', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="长度(mm)">
                     <uni-list-item title="长度(mm)">
@@ -92,13 +92,13 @@
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="长度公差上限(mm)">
                     <uni-list-item title="长度公差上限(mm)">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput type="text" v-model="item.lengthTolPos" :inputBorder="false"
+                            <uni-easyinput type="digit" v-model="item.lengthTolPos" :inputBorder="false"
                                 placeholder="请输入长度公差上限" @input="onNumberInput(idx, 'lengthTolPos')" @blur="onNumberBlur(idx, 'lengthTolPos', 9)" />
                                 placeholder="请输入长度公差上限" @input="onNumberInput(idx, 'lengthTolPos')" @blur="onNumberBlur(idx, 'lengthTolPos', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="长度公差下限(mm)">
                     <uni-list-item title="长度公差下限(mm)">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput type="text" v-model="item.lengthTolNeg" :inputBorder="false"
+                            <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false"
                                 placeholder="请输入长度公差下限" @input="onNumberInput(idx, 'lengthTolNeg')" @blur="onNumberBlur(idx, 'lengthTolNeg', 9)" />
                                 placeholder="请输入长度公差下限" @input="onNumberInput(idx, 'lengthTolNeg')" @blur="onNumberBlur(idx, 'lengthTolNeg', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
@@ -109,7 +109,7 @@
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="数量">
                     <uni-list-item title="数量">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.quantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'quantity')" @blur="onNonNegativeBlur(idx, 'quantity', 9)" />
+                            <uni-easyinput v-model="item.quantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'quantity')" @blur="onNonNegativeBlur(idx, 'quantity', 2)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="单价">
                     <uni-list-item title="单价">
@@ -119,17 +119,17 @@
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="外贸加工费">
                     <uni-list-item title="外贸加工费">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.processingFee" type="number" :inputBorder="false" placeholder="请输入外贸加工费" />
+                            <uni-easyinput v-model="item.processingFee" type="digit" :inputBorder="false" placeholder="请输入外贸加工费" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <!-- <uni-list-item title="不含税金额">
                     <!-- <uni-list-item title="不含税金额">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.amountExcludingTax" type="number" :inputBorder="false" disabled placeholder="自动计算" />
+                            <uni-easyinput v-model="item.amountExcludingTax" type="number" :inputBorder="false" disabled placeholder="" />
                         </template>
                         </template>
                     </uni-list-item> -->
                     </uni-list-item> -->
                     <uni-list-item title="总金额">
                     <uni-list-item title="总金额">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.totalAmount" type="number" :inputBorder="false" disabled placeholder="自动计算" />
+                            <uni-easyinput v-model="item.totalAmount" type="number" :inputBorder="false" disabled placeholder="" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="发货日期">
                     <uni-list-item title="发货日期">
@@ -157,29 +157,33 @@
                 <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.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.quality }}</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 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 > 0 ? '+' + item.thicknessTolPos : item.thicknessTolPos }}
                             </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 v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg > 0 ? '+' + item.thicknessTolNeg : item.thicknessTolNeg }}
                             </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 v-if="item.width" class="value-spec_val p12">*</view>
+                        <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
+                        <view v-if="item.width" class="value-spec_box">
+                            <view v-if="item.widthTolPos" class="value-spec_box_1">{{ item.widthTolPos > 0 ? '+' + item.widthTolPos : item.widthTolPos }}
+                            </view>
+                            <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg > 0 ? '+' + item.widthTolNeg : item.widthTolNeg }}
+                            </view>
+                        </view>
+                        <view v-if="item.length" class="value-spec_val p12">*</view>
+                        <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
+                        <view v-if="item.length" class="value-spec_box">
+                            <view v-if="item.lengthTolPos" class="value-spec_box_1">{{ item.lengthTolPos > 0 ? '+' + item.lengthTolPos : item.lengthTolPos }}
+                            </view>
+                            <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg > 0 ? '+' + item.lengthTolNeg : item.lengthTolNeg }}
                             </view>
                             </view>
                         </view>
                         </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.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">{{ item.quantity }}</text></view>
                 <view class="row"><text class="label">单价</text><text class="value">{{ formatCurrency(item.unitPrice)
                 <view class="row"><text class="label">单价</text><text class="value">{{ formatCurrency(item.unitPrice)
@@ -232,12 +236,10 @@ export default {
       const m = Number(parts[1])
       const m = Number(parts[1])
       const d = Number(parts[2])
       const d = Number(parts[2])
       if (!y || !m || !d) return ''
       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}`
+      const yy = y
+      const mm = String(m).padStart(2, '0')
+      const dd = String(d).padStart(2, '0')
+      return `${yy}-${mm}-${dd}`
     }
     }
   },
   },
   watch: {
   watch: {

@@ -64,9 +64,9 @@
                 </uni-list-item>
                 </uni-list-item>
                 <ProductRel ref="productRel" mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate"
                 <ProductRel ref="productRel" mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate"
                 @change="onProductsChange" :options="productList" />
                 @change="onProductsChange" :options="productList" />
-                <uni-list-item title="合计人民币金额（大写）">
+                <uni-list-item title="合计金额（大写）">
                     <template v-slot:footer>
                     <template v-slot:footer>
-                        <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false" disabled />
+                        <uni-easyinput v-model="form.totalAmountCapital" placeholder="" :inputBorder="false" disabled />
                     </template>
                     </template>
                 </uni-list-item>
                 </uni-list-item>
                 <uni-list-item title="交付定金、数额、时间">
                 <uni-list-item title="交付定金、数额、时间">
@@ -189,7 +189,7 @@
                         <div class="total-text">
                         <div class="total-text">
                             合计
                             合计
                         </div>
                         </div>
-                        <div class="total-item">
+                        <div class="total-item" style="padding: 20rpx 0;">
                             <div class="total-item-text">
                             <div class="total-item-text">
                                 数量
                                 数量
                             </div>
                             </div>
@@ -205,14 +205,14 @@
                                 ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}
                                 ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}
                             </div>
                             </div>
                         </div> -->
                         </div> -->
-                        <div class="total-item">
+                        <!-- <div class="total-item">
                             <div class="total-item-text">
                             <div class="total-item-text">
                                 总金额
                                 总金额
                             </div>
                             </div>
                             <div class="total-item-price text-red">
                             <div class="total-item-price text-red">
-                                ￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}
+                                -
                             </div>
                             </div>
-                        </div>
+                        </div> -->
                     </div>
                     </div>
                     <button class="btn submit" type="primary" @click="onSubmit">提交</button>
                     <button class="btn submit" type="primary" @click="onSubmit">提交</button>
                 </view>
                 </view>
@@ -559,7 +559,7 @@ export default {
         async onSubmit() {
         async onSubmit() {
             if (!this.validateRequired()) return
             if (!this.validateRequired()) return
             const confirmRes = await new Promise(resolve => {
             const confirmRes = await new Promise(resolve => {
-                uni.showModal({ title: '提示', content: '确定新增经销未锁规合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
+                uni.showModal({ title: '提示', content: '确定新增外贸库存合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
             })
             })
             if (!(confirmRes && confirmRes.confirm)) return
             if (!(confirmRes && confirmRes.confirm)) return
             const clean = (obj) => {
             const clean = (obj) => {

@@ -40,7 +40,7 @@
                 </view>
                 </view>
 
 
                 <view class="section">
                 <view class="section">
-                    <view class="row"><text class="label">合计人民币金额（大写）</text><text class="value">{{
+                    <view class="row"><text class="label">合计金额（大写）</text><text class="value">{{
                         detail.totalAmountCapital || '-' }}</text></view>
                         detail.totalAmountCapital || '-' }}</text></view>
                     <view class="row"><text class="label">交付定金、数额、时间</text><text class="value">{{ detail.depositInfo ||
                     <view class="row"><text class="label">交付定金、数额、时间</text><text class="value">{{ detail.depositInfo ||
                         '-' }}</text></view>
                         '-' }}</text></view>
@@ -73,13 +73,15 @@
                 </view>
                 </view>
 
 
                <view class="section" v-if="detail.status === 'STANDARD'">
                <view class="section" v-if="detail.status === 'STANDARD'">
-                    <view class="row"><text class="label">规范性合同</text><text class="value" style="color: #3D48A3;">{{
+                <view class="row"><text class="label">双方盖章合同</text><text class="value act" @click="downloadFile(detail.signedContractFileId, detail.signedContractFileName)">{{
+                        detail.signedContractFileName || '-' }}</text></view>
+                    <view class="row"><text class="label">规范性合同</text><text class="value act" @click="downloadFile(detail.standardFileId, detail.standardFileName)">{{
                         detail.standardFileName || '-' }}</text></view>
                         detail.standardFileName || '-' }}</text></view>
                     <view class="row"><text class="label">合同是否规范</text><text class="value">{{
                     <view class="row"><text class="label">合同是否规范</text><text class="value">{{
                         detail.standardStandardized ? '是' : '否' }}</text></view>
                         detail.standardStandardized ? '是' : '否' }}</text></view>
                 </view>
                 </view>
                 <view class="section" v-if="detail.status === 'FORMAL'">
                 <view class="section" v-if="detail.status === 'FORMAL'">
-                    <view class="row"><text class="label">规范性合同</text><text class="value" style="color: #3D48A3;">{{
+                    <view class="row"><text class="label">规范性合同</text><text class="value act" @click="downloadFile(detail.formalFileId, detail.formalFileName)">{{
                         detail.formalFileName || '-' }}</text></view>
                         detail.formalFileName || '-' }}</text></view>
                     <view class="row"><text class="label">合同是否规范</text><text class="value">{{ detail.formalStandardized
                     <view class="row"><text class="label">合同是否规范</text><text class="value">{{ detail.formalStandardized
                             ? '是' : '否' }}</text></view>
                             ? '是' : '否' }}</text></view>
@@ -138,6 +140,7 @@ import DetailButtons from '@/components/detail-buttons/index.vue'
 import FileUpload from '@/components/file-upload/index.vue'
 import FileUpload from '@/components/file-upload/index.vue'
 import SingleSelectSheet from '@/components/single-select/index.vue'
 import SingleSelectSheet from '@/components/single-select/index.vue'
 import { fillStandardApprovedName, fillFormalApprovedName } from '@/utils/dic.js'
 import { fillStandardApprovedName, fillFormalApprovedName } from '@/utils/dic.js'
+import { downloadFile } from '@/utils/downloadFile.js'
 
 
 export default {
 export default {
     name: 'ContractForeignStockDetail',
     name: 'ContractForeignStockDetail',
@@ -294,13 +297,13 @@ export default {
                 { ...this.buttons[3], visible: ((s === 'DRAFT' || s === 'FORMAL') && t !== 'AUDIT' && t !== 'PASS' && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:upload')) }, 
                 { ...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[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[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[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[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[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')) }, 
                 { ...this.buttons[12], visible: (s === 'STANDARD' && this.$auth.hasPermi('contract-manage:foreign-trade-inventory-contract:upload-seal')) }, 
+                { ...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')) }, 
             ]
             ]
         }
         }
     },
     },
@@ -366,7 +369,7 @@ export default {
                 })
                 })
                 return
                 return
             }
             }
-            if (!this.standardStandardized && this.uploadType !== 'seal') {
+            if (!this.standardStandardized && this.standardStandardized !== false && this.uploadType !== 'seal') {
                 uni.showToast({
                 uni.showToast({
                     title: '请选择合同是否规范',
                     title: '请选择合同是否规范',
                     icon: 'error'
                     icon: 'error'
@@ -465,6 +468,7 @@ export default {
             uni.setStorageSync(CACHE_KEY, id)
             uni.setStorageSync(CACHE_KEY, id)
             uni.navigateTo({ url: '/pages/flow/audit_detail' })
             uni.navigateTo({ url: '/pages/flow/audit_detail' })
         },
         },
+        downloadFile,
         async loadDetail() {
         async loadDetail() {
             if (!this.id) return
             if (!this.id) return
             try {
             try {
@@ -546,6 +550,10 @@ export default {
     &_已签收 {
     &_已签收 {
       background-image: url('~@/static/images/contract/status_4.png');
       background-image: url('~@/static/images/contract/status_4.png');
     }
     }
+
+    &_已取消 {
+      background-image: url('~@/static/images/contract/status_5.png');
+    }
   }
   }
 }
 }
 
 
@@ -565,7 +573,8 @@ export default {
 }
 }
 
 
 .label {
 .label {
-    width: 310rpx;
+    max-width: 310rpx;
+    margin-right: 20rpx;
     color: rgba(0, 0, 0, 0.6);
     color: rgba(0, 0, 0, 0.6);
     font-size: 28rpx;
     font-size: 28rpx;
 }
 }
@@ -575,6 +584,11 @@ export default {
     text-align: right;
     text-align: right;
     color: rgba(0, 0, 0, 0.9);
     color: rgba(0, 0, 0, 0.9);
     font-size: 28rpx;
     font-size: 28rpx;
+    white-space: pre-wrap;
+    word-break: break-all;
+    &.act {
+      color: $theme-primary;
+    }
 }
 }
 
 
 .customer {
 .customer {
@@ -638,4 +652,7 @@ export default {
     color: rgba(0, 0, 0, 0.6);
     color: rgba(0, 0, 0, 0.6);
     font-size: 32rpx;
     font-size: 32rpx;
 }
 }
+.upload-row {
+    margin-top: 20rpx;
+}
 </style>
 </style>

@@ -49,7 +49,7 @@
           <view class="card" @click="goDetail(item)">
           <view class="card" @click="goDetail(item)">
             <view class="card-header">
             <view class="card-header">
               <text class="title omit2">{{ item.buyerName }}</text>
               <text class="title omit2">{{ item.buyerName }}</text>
-              <text v-if="item.status === 'STANDARD'" :class="['status']" :style="{ background: statusMap[item.shippingStatusName] }">{{ item.shippingStatusName }}</text>
+              <text v-if="item.status === 'STANDARD'" :class="['status', 'status_' + item.shippingStatusName]">{{ item.shippingStatusName }}</text>
             </view>
             </view>
             <view class="info-row">
             <view class="info-row">
               <text>编号</text><text>{{ item.code }}</text>
               <text>编号</text><text>{{ item.code }}</text>
@@ -96,8 +96,7 @@
 <script>
 <script>
 import CardList from '@/components/card/index.vue'
 import CardList from '@/components/card/index.vue'
 import FilterModal from '@/components/filter/index.vue'
 import FilterModal from '@/components/filter/index.vue'
-import { queryContractApi, statusStyle,statusMap } from '@/api/contract.js'
-import { officeQueryApi } from '@/api/devManage.js'
+import { queryContractApi, statusStyle } from '@/api/contract.js'
 
 
 export default {
 export default {
   components: { CardList, FilterModal },
   components: { CardList, FilterModal },
@@ -118,7 +117,6 @@ export default {
       filterForm: { deptId: '', deptName: '', dateRange: [] },
       filterForm: { deptId: '', deptName: '', dateRange: [] },
       deptSelectVisible: false,
       deptSelectVisible: false,
       statusStyle,
       statusStyle,
-      statusMap,
     }
     }
   },
   },
   computed: {
   computed: {
@@ -330,26 +328,30 @@ export default {
             font-size: 30rpx;
             font-size: 30rpx;
             font-weight: 600;
             font-weight: 600;
             position: absolute;
             position: absolute;
-            top: -36rpx;
-            right: -32rpx;
+            top: -32rpx;
+            right: -12rpx;
             height: 48rpx;
             height: 48rpx;
-            line-height: 48rpx;
+            line-height: 50rpx;
             color: #fff;
             color: #fff;
             font-size: 24rpx;
             font-size: 24rpx;
             padding: 0 14rpx;
             padding: 0 14rpx;
             border-radius: 6rpx;
             border-radius: 6rpx;
-            &.status_1 {
+            &_审批中 {
                 background: $theme-primary;
                 background: $theme-primary;
             }
             }
-            &.status_2 {
+            &_生产中 {
                 background: #2BA471;
                 background: #2BA471;
             }
             }
-            &.status_3 {
-                background: #D54941;
+            &_已发货 {
+                background: #E37318;
             }
             }
-            &.status_4 {
-                background: #E7E7E7;
-                color: rgba(0,0,0,0.9);
+            &_已签收 {
+                background: #858A99;
+                color: #ffffff;
+            }
+            &_已取消 {
+                background: #9E9E9E;
+                color: #ffffff;
             }
             }
         }
         }
     }
     }
@@ -380,19 +382,19 @@ export default {
     }
     }
 }
 }
 
 
-.filter-form { 
+.filter-form {
     .form-item { margin-bottom: 24rpx; }
     .form-item { margin-bottom: 24rpx; }
-    .label { 
-        margin-bottom: 20rpx; 
+    .label {
+        margin-bottom: 20rpx;
         color: rgba(0,0,0,0.9);
         color: rgba(0,0,0,0.9);
         height: 44rpx;
         height: 44rpx;
         line-height: 44rpx;
         line-height: 44rpx;
         font-size: 30rpx;
         font-size: 30rpx;
      }
      }
-    .fake-select { 
-        height: 80rpx; line-height: 80rpx; padding: 0 20rpx; background: #f3f3f3; border-radius: 12rpx; 
+    .fake-select {
+        height: 80rpx; line-height: 80rpx; padding: 0 20rpx; background: #f3f3f3; border-radius: 12rpx;
         .placeholder { color: #999; }
         .placeholder { color: #999; }
         .value { color: #333; }
         .value { color: #333; }
     }
     }
 }
 }
-</style>
+</style>

@@ -4,14 +4,9 @@
             <view class="lock-page">
             <view class="lock-page">
                 <view class="block" v-for="(item, idx) in items" :key="idx">
                 <view class="block" v-for="(item, idx) in items" :key="idx">
                     <view class="block-header">
                     <view class="block-header">
-                        <uni-data-checkbox
-                            multiple
-                            mode="default"
-                            :localdata="[{ text: '锁价', value: 'LOCKED' }]"
-                            :modelValue="item.locked ? ['LOCKED'] : []"
-                            :disabled="true"
-                            @change="onLockChange(idx, $event)"
-                        />
+                        <uni-data-checkbox multiple mode="default" :localdata="[{ text: '锁价', value: 'LOCKED' }]"
+                            :modelValue="item.locked ? ['LOCKED'] : []" :disabled="true"
+                            @change="onLockChange(idx, $event)" />
                         <view class="ops" @click="toggleItem(idx)">
                         <view class="ops" @click="toggleItem(idx)">
                             <image class="opIcon"
                             <image class="opIcon"
                                 :src="item.collapsed ? '/static/images/up.png' : '/static/images/down.png'" />
                                 :src="item.collapsed ? '/static/images/up.png' : '/static/images/down.png'" />
@@ -22,12 +17,14 @@
                     <uni-list v-show="item.collapsed">
                     <uni-list v-show="item.collapsed">
                         <uni-list-item title="产品名称">
                         <uni-list-item title="产品名称">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput v-model="item.productName" placeholder="请输入产品名称" :clearable="false" disabled />
+                                <uni-easyinput v-model="item.productName" placeholder="请输入产品名称" :clearable="false"
+                                    disabled />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="行业">
                         <uni-list-item title="行业">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput v-model="item.industry" placeholder="请输入行业" :clearable="false" disabled />
+                                <uni-easyinput v-model="item.industry" placeholder="请输入行业" :clearable="false"
+                                    disabled />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="牌号">
                         <uni-list-item title="牌号">
@@ -42,28 +39,39 @@
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="规格(mm)">
                         <uni-list-item title="规格(mm)">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <!-- <uni-easyinput v-model="item.specDisplay" placeholder="自动拼接规格" :clearable="false" disabled /> -->
-                            <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 class="value value-spec">
+                                    <view v-if="item.thickness" class="value-spec_val">{{ item.thickness }}</view>
+                                    <view v-if="item.thickness" class="value-spec_box">
+                                        <view v-if="item.thicknessTolPos" class="value-spec_box_1">{{
+                                            item.thicknessTolPos > 0 ? '+' + item.thicknessTolPos : item.thicknessTolPos
+                                            }}
+                                        </view>
+                                        <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{
+                                            item.thicknessTolNeg > 0 ? '+' + item.thicknessTolNeg : item.thicknessTolNeg
+                                            }}
+                                        </view>
+                                    </view>
+                                    <view v-if="item.width" class="value-spec_val p12">*</view>
+                                    <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
+                                    <view v-if="item.width" class="value-spec_box">
+                                        <view v-if="item.widthTolPos" class="value-spec_box_1">{{ item.widthTolPos > 0 ?
+                                            '+' + item.widthTolPos : item.widthTolPos }}
+                                        </view>
+                                        <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg > 0 ?
+                                            '+' + item.widthTolNeg : item.widthTolNeg }}
+                                        </view>
+                                    </view>
+                                    <view v-if="item.length" class="value-spec_val p12">*</view>
+                                    <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
+                                    <view v-if="item.length" class="value-spec_box">
+                                        <view v-if="item.lengthTolPos" class="value-spec_box_1">{{ item.lengthTolPos > 0
+                                            ? '+' + item.lengthTolPos : item.lengthTolPos }}
+                                        </view>
+                                        <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg > 0
+                                            ? '+' + item.lengthTolNeg : item.lengthTolNeg }}
+                                        </view>
+                                    </view>
                                 </view>
                                 </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>
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="状态">
                         <uni-list-item title="状态">
@@ -73,27 +81,32 @@
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="数量">
                         <uni-list-item title="数量">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput v-model="item.quantity" type="number" :inputBorder="false" disabled placeholder="不可编辑" />
+                                <uni-easyinput v-model="item.quantity" type="number" :inputBorder="false" disabled
+                                    placeholder="不可编辑" />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="单价">
                         <uni-list-item title="单价">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput v-model="item.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="onImmediateChange(idx)"
+                                    @blur="onNumberBlur(idx, 'unitPrice', 0)" />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
-                        <uni-list-item title="不含税金额">
+                        <!-- <uni-list-item title="不含税金额">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput v-model="item.amountExcludingTax" type="number" :inputBorder="false" disabled placeholder="自动计算" />
+                                <uni-easyinput v-model="item.amountExcludingTax" type="number" :inputBorder="false"
+                                    disabled placeholder="" />
                             </template>
                             </template>
-                        </uni-list-item>
+                        </uni-list-item> -->
                         <uni-list-item title="总金额">
                         <uni-list-item title="总金额">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput v-model="item.totalAmount" type="number" :inputBorder="false" disabled placeholder="自动计算" />
+                                <uni-easyinput v-model="item.totalAmount" type="number" :inputBorder="false" disabled
+                                    placeholder="" />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="发货日期">
                         <uni-list-item title="发货日期">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput v-model="item.deliveryDate"  :inputBorder="false" disabled  />
+                                <uni-easyinput v-model="item.deliveryDate" :inputBorder="false" disabled />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                     </uni-list>
                     </uni-list>
@@ -101,12 +114,14 @@
                     <uni-list v-show="!item.collapsed">
                     <uni-list v-show="!item.collapsed">
                         <uni-list-item title="产品名称">
                         <uni-list-item title="产品名称">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput v-model="item.productName" placeholder="请输入产品名称" :clearable="false" disabled />
+                                <uni-easyinput v-model="item.productName" placeholder="请输入产品名称" :clearable="false"
+                                    disabled />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="行业">
                         <uni-list-item title="行业">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput v-model="item.industry" placeholder="请输入行业" :clearable="false" disabled />
+                                <uni-easyinput v-model="item.industry" placeholder="请输入行业" :clearable="false"
+                                    disabled />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="牌号">
                         <uni-list-item title="牌号">
@@ -114,44 +129,45 @@
                                 <uni-easyinput v-model="item.brand" placeholder="请输入牌号" :clearable="false" disabled />
                                 <uni-easyinput v-model="item.brand" placeholder="请输入牌号" :clearable="false" disabled />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
-                        <view class="footer">
-                            <div class="total">
-                                <div class="total-text">
-                                    合计
-                                </div>
-                                <div class="total-item">
-                                    <div class="total-item-text">
-                                        数量
-                                    </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">
-                                        ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}
-                                    </div>
-                                </div> -->
-                                <div class="total-item">
-                                    <div class="total-item-text">
-                                        总金额
-                                    </div>
-                                    <div class="total-item-price text-red">
-                                        ￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}
-                                    </div>
-                                </div>
-                            </div>
-                            <button class="btn submit" type="primary" @click="onSubmit">提交</button>
-                        </view>
+                        
                     </uni-list>
                     </uni-list>
                 </view>
                 </view>
+                <view class="footer">
+                    <div class="total">
+                        <div class="total-text">
+                            合计
+                        </div>
+                        <div class="total-item">
+                            <div class="total-item-text">
+                                数量
+                            </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">
+                                ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}
+                            </div>
+                        </div> -->
+                        <div class="total-item">
+                            <div class="total-item-text">
+                                总金额
+                            </div>
+                            <div class="total-item-price text-red">
+                                ￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}
+                            </div>
+                        </div>
+                    </div>
+                    <button class="btn submit" type="primary" @click="onSubmit">提交</button>
+                </view>
             </view>
             </view>
         </scroll-view>
         </scroll-view>
 
 
-        
+
     </view>
     </view>
 </template>
 </template>
 
 
@@ -168,7 +184,7 @@ export default {
             planQty: 30,
             planQty: 30,
         }
         }
     },
     },
-  computed: {
+    computed: {
         totalQuantity() {
         totalQuantity() {
             const qty = this.items.filter(it => it.locked).reduce((p, c) => p + this.toNumber(c.quantity), 0)
             const qty = this.items.filter(it => it.locked).reduce((p, c) => p + this.toNumber(c.quantity), 0)
             return this.round(qty, 2)
             return this.round(qty, 2)
@@ -337,7 +353,7 @@ export default {
             }
             }
             const invalid = selected.find(r => {
             const invalid = selected.find(r => {
                 const p = this.toNumber(r.unitPrice)
                 const p = this.toNumber(r.unitPrice)
-                return !( p > 0)
+                return !(p > 0)
             })
             })
             if (invalid) {
             if (invalid) {
                 uni.showToast({ title: '请填写单价', icon: 'none' })
                 uni.showToast({ title: '请填写单价', icon: 'none' })
@@ -350,7 +366,7 @@ export default {
                 // totalAmountExcludingTax: this.totalAmountExcludingTax,
                 // totalAmountExcludingTax: this.totalAmountExcludingTax,
                 totalAmountIncludingTax: this.totalAmountIncludingTax,
                 totalAmountIncludingTax: this.totalAmountIncludingTax,
                 totalQuantity: this.totalQuantity,
                 totalQuantity: this.totalQuantity,
-                type:'INTL_INVENTORY_AGMT',
+                type: 'INTL_INVENTORY_AGMT',
                 contractDistributorLineList: selected
                 contractDistributorLineList: selected
             }
             }
 
 
@@ -365,7 +381,7 @@ export default {
                                 uni.navigateTo({ url: '/pages/contract_foreign_stock/index' })
                                 uni.navigateTo({ url: '/pages/contract_foreign_stock/index' })
                             }, 500)
                             }, 500)
                         }).catch((err) => {
                         }).catch((err) => {
-                            uni.showToast({ title: err.msg ||'提交失败', icon: 'none' })
+                            uni.showToast({ title: err.msg || '提交失败', icon: 'none' })
                         })
                         })
                     }
                     }
                 }
                 }
@@ -424,6 +440,7 @@ export default {
     width: 36rpx;
     width: 36rpx;
     height: 36rpx;
     height: 36rpx;
 }
 }
+
 .block-header ::v-deep .uni-data-checklist .checklist-text {
 .block-header ::v-deep .uni-data-checklist .checklist-text {
     font-size: 28rpx;
     font-size: 28rpx;
     margin-left: 12rpx;
     margin-left: 12rpx;
@@ -556,6 +573,7 @@ export default {
 ::v-deep .is-disabled {
 ::v-deep .is-disabled {
     background-color: transparent !important;
     background-color: transparent !important;
 }
 }
+
 // ::v-deep .uni-list-item__content-title {
 // ::v-deep .uni-list-item__content-title {
 //     font-size: 28rpx;
 //     font-size: 28rpx;
 //     color: rgba(0, 0, 0, 0.9);
 //     color: rgba(0, 0, 0, 0.9);
@@ -721,42 +739,45 @@ export default {
     background: $theme-primary;
     background: $theme-primary;
     color: #fff;
     color: #fff;
 }
 }
-   .value-spec {
+
+.value-spec {
+    height: 48rpx;
+    display: flex;
+    align-items: center;
+    color: #000000;
+
+    // justify-content: end;
+    &_box {
+        position: relative;
+        width: 60rpx;
         height: 48rpx;
         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;
-            }
+        &_1 {
+            font-size: 16rpx;
+            position: absolute;
+            top: -10rpx;
+            left: 0;
         }
         }
 
 
-        &_val {
-            font-size: 28rpx;
-
-            &.p12 {
-                padding-right: 12rpx;
-            }
+        &_2 {
+            font-size: 16rpx;
+            position: absolute;
+            bottom: -10rpx;
+            left: 0;
         }
         }
     }
     }
-        .row-spec {
-            height: 60rpx;
-            align-items: center;
+
+    &_val {
+        font-size: 28rpx;
+
+        &.p12 {
+            padding-right: 12rpx;
         }
         }
+    }
+}
+
+.row-spec {
+    height: 60rpx;
+    align-items: center;
+}
 </style>
 </style>

@@ -67,9 +67,9 @@
                 <ProductRel ref="productRel" mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate"
                 <ProductRel ref="productRel" mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate"
                 :list="productLineList" @change="onProductsChange" :options="productList" />
                 :list="productLineList" @change="onProductsChange" :options="productList" />
 
 
-                <uni-list-item title="合计人民币金额（大写）">
+                <uni-list-item title="合计金额（大写）">
                     <template v-slot:footer>
                     <template v-slot:footer>
-                        <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false"
+                        <uni-easyinput v-model="form.totalAmountCapital" placeholder="" :inputBorder="false"
                             disabled />
                             disabled />
                     </template>
                     </template>
                 </uni-list-item>
                 </uni-list-item>
@@ -188,7 +188,7 @@
                 <view class="footer">
                 <view class="footer">
                     <div class="total">
                     <div class="total">
                         <div class="total-text">合计</div>
                         <div class="total-text">合计</div>
-                        <div class="total-item">
+                        <div class="total-item" style="padding: 20rpx 0;">
                             <div class="total-item-text">数量</div>
                             <div class="total-item-text">数量</div>
                             <div class="total-item-price">{{ (totalQuantity || 0).toFixed(2) }}kg</div>
                             <div class="total-item-price">{{ (totalQuantity || 0).toFixed(2) }}kg</div>
                         </div>
                         </div>
@@ -196,10 +196,10 @@
                             <div class="total-item-text">不含税金额</div>
                             <div class="total-item-text">不含税金额</div>
                             <div class="total-item-price text-red">￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}</div>
                             <div class="total-item-price text-red">￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}</div>
                         </div> -->
                         </div> -->
-                        <div class="total-item">
+                        <!-- <div class="total-item">
                             <div class="total-item-text">总金额</div>
                             <div class="total-item-text">总金额</div>
                             <div class="total-item-price text-red">￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}</div>
                             <div class="total-item-price text-red">￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}</div>
-                        </div>
+                        </div> -->
                     </div>
                     </div>
                     <button class="btn submit" type="primary" @click="onSubmit">保存</button>
                     <button class="btn submit" type="primary" @click="onSubmit">保存</button>
                 </view>
                 </view>
@@ -534,7 +534,7 @@ export default {
             console.log('onSubmit__payload', payload)
             console.log('onSubmit__payload', payload)
             if (!this.validateRequired()) return
             if (!this.validateRequired()) return
             const confirmRes = await new Promise(resolve => {
             const confirmRes = await new Promise(resolve => {
-                uni.showModal({ title: '提示', content: '确定保存当前经销未锁规合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
+                uni.showModal({ title: '提示', content: '确定保存当前外贸库存合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
             })
             })
             if (!(confirmRes && confirmRes.confirm)) return
             if (!(confirmRes && confirmRes.confirm)) return
             const clean = (obj) => {
             const clean = (obj) => {

@@ -60,13 +60,13 @@
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="厚度公差上限(mm)">
                     <uni-list-item title="厚度公差上限(mm)">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput type="text" v-model="item.thicknessTolPos" :inputBorder="false"
+                            <uni-easyinput type="digit" v-model="item.thicknessTolPos" :inputBorder="false"
                                 placeholder="请输入厚度公差上限" @input="onNumberInput(idx, 'thicknessTolPos')" @blur="onNumberBlur(idx, 'thicknessTolPos', 9)" />
                                 placeholder="请输入厚度公差上限" @input="onNumberInput(idx, 'thicknessTolPos')" @blur="onNumberBlur(idx, 'thicknessTolPos', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="厚度公差下限(mm)">
                     <uni-list-item title="厚度公差下限(mm)">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput type="text" v-model="item.thicknessTolNeg" :inputBorder="false"
+                            <uni-easyinput type="digit" v-model="item.thicknessTolNeg" :inputBorder="false"
                                 placeholder="请输入厚度公差下限" @input="onNumberInput(idx, 'thicknessTolNeg')" @blur="onNumberBlur(idx, 'thicknessTolNeg', 9)" />
                                 placeholder="请输入厚度公差下限" @input="onNumberInput(idx, 'thicknessTolNeg')" @blur="onNumberBlur(idx, 'thicknessTolNeg', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
@@ -77,13 +77,13 @@
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="宽度公差上限(mm)">
                     <uni-list-item title="宽度公差上限(mm)">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput type="text" v-model="item.widthTolPos" :inputBorder="false"
+                            <uni-easyinput type="digit" v-model="item.widthTolPos" :inputBorder="false"
                                 placeholder="请输入宽度公差上限" @input="onNumberInput(idx, 'widthTolPos')" @blur="onNumberBlur(idx, 'widthTolPos', 9)" />
                                 placeholder="请输入宽度公差上限" @input="onNumberInput(idx, 'widthTolPos')" @blur="onNumberBlur(idx, 'widthTolPos', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="宽度公差下限(mm)">
                     <uni-list-item title="宽度公差下限(mm)">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput type="text" v-model="item.widthTolNeg" :inputBorder="false"
+                            <uni-easyinput type="digit" v-model="item.widthTolNeg" :inputBorder="false"
                                 placeholder="请输入宽度公差下限" @input="onNumberInput(idx, 'widthTolNeg')" @blur="onNumberBlur(idx, 'widthTolNeg', 9)" />
                                 placeholder="请输入宽度公差下限" @input="onNumberInput(idx, 'widthTolNeg')" @blur="onNumberBlur(idx, 'widthTolNeg', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
@@ -94,13 +94,13 @@
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="长度公差上限(mm)">
                     <uni-list-item title="长度公差上限(mm)">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput type="text" v-model="item.lengthTolPos" :inputBorder="false"
+                            <uni-easyinput type="digit" v-model="item.lengthTolPos" :inputBorder="false"
                                 placeholder="请输入长度公差上限" @input="onNumberInput(idx, 'lengthTolPos')" @blur="onNumberBlur(idx, 'lengthTolPos', 9)" />
                                 placeholder="请输入长度公差上限" @input="onNumberInput(idx, 'lengthTolPos')" @blur="onNumberBlur(idx, 'lengthTolPos', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="长度公差下限(mm)">
                     <uni-list-item title="长度公差下限(mm)">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput type="text" v-model="item.lengthTolNeg" :inputBorder="false"
+                            <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false"
                                 placeholder="请输入长度公差下限" @input="onNumberInput(idx, 'lengthTolNeg')" @blur="onNumberBlur(idx, 'lengthTolNeg', 9)" />
                                 placeholder="请输入长度公差下限" @input="onNumberInput(idx, 'lengthTolNeg')" @blur="onNumberBlur(idx, 'lengthTolNeg', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
@@ -111,27 +111,27 @@
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="数量">
                     <uni-list-item title="数量">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.quantity" type="digit" :inputBorder="false" placeholder="请输入数量" @input="onNonNegativeInput(idx, 'quantity')" @blur="onNonNegativeBlur(idx, 'quantity', 9)" />
+                            <uni-easyinput v-model="item.quantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'quantity')" @blur="onNonNegativeBlur(idx, 'quantity', 2)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="单价">
                     <uni-list-item title="单价">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.unitPrice" disabled type="number" :inputBorder="false" placeholder="请输入单价" @input="onImmediateChange(idx)" @blur="onNumberBlur(idx, 'unitPrice', 9)" />
+                            <uni-easyinput  placeholder="-"  disabled type="number" :inputBorder="false" @input="onImmediateChange(idx)" @blur="onNumberBlur(idx, 'unitPrice', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="外贸加工费">
                     <uni-list-item title="外贸加工费">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.processingFee" type="number" :inputBorder="false" placeholder="请输入外贸加工费" />
+                            <uni-easyinput v-model="item.processingFee" type="digit" :inputBorder="false" placeholder="请输入外贸加工费" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <!-- <uni-list-item title="不含税金额">
                     <!-- <uni-list-item title="不含税金额">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.amountExcludingTax" type="number" :inputBorder="false" disabled placeholder="自动计算" />
+                            <uni-easyinput v-model="item.amountExcludingTax" type="number" :inputBorder="false" disabled placeholder="" />
                         </template>
                         </template>
                     </uni-list-item> -->
                     </uni-list-item> -->
                     <uni-list-item title="总金额">
                     <uni-list-item title="总金额">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.totalAmount" type="number" :inputBorder="false" disabled placeholder="自动计算" />
+                            <uni-easyinput :inputBorder="false" disabled placeholder="-" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="发货日期">
                     <uni-list-item title="发货日期">
@@ -159,29 +159,33 @@
                 <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.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.quality }}</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 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 > 0 ? '+' + item.thicknessTolPos : item.thicknessTolPos }}
                             </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 v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg > 0 ? '+' + item.thicknessTolNeg : item.thicknessTolNeg }}
                             </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 v-if="item.width" class="value-spec_val p12">*</view>
+                        <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
+                        <view v-if="item.width" class="value-spec_box">
+                            <view v-if="item.widthTolPos" class="value-spec_box_1">{{ item.widthTolPos > 0 ? '+' + item.widthTolPos : item.widthTolPos }}
+                            </view>
+                            <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg > 0 ? '+' + item.widthTolNeg : item.widthTolNeg }}
+                            </view>
+                        </view>
+                        <view v-if="item.length" class="value-spec_val p12">*</view>
+                        <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
+                        <view v-if="item.length" class="value-spec_box">
+                            <view v-if="item.lengthTolPos" class="value-spec_box_1">{{ item.lengthTolPos > 0 ? '+' + item.lengthTolPos : item.lengthTolPos }}
+                            </view>
+                            <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg > 0 ? '+' + item.lengthTolNeg : item.lengthTolNeg }}
                             </view>
                             </view>
                         </view>
                         </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.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">{{ item.quantity }}</text></view>
                 <view class="row"><text class="label">单价</text><text class="value">{{ formatCurrency(item.unitPrice)
                 <view class="row"><text class="label">单价</text><text class="value">{{ formatCurrency(item.unitPrice)
@@ -247,20 +251,18 @@ export default {
       }))
       }))
     },
     },
     minDeliveryDate() {
     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}`
-        }
+      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 yy = y
+      const mm = String(m).padStart(2, '0')
+      const dd = String(d).padStart(2, '0')
+      return `${yy}-${mm}-${dd}`
+    }
   },
   },
   methods: {
   methods: {
         defaultItem() {
         defaultItem() {

@@ -62,9 +62,9 @@
                 </template>
                 </template>
                 </uni-list-item>
                 </uni-list-item>
                 <ProductRel ref="productRel" mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" @change="onProductsChange" :options="productList" />
                 <ProductRel ref="productRel" mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" @change="onProductsChange" :options="productList" />
-                <uni-list-item title="合计人民币金额（大写）">
+                <uni-list-item title="合计金额（大写）">
                     <template v-slot:footer>
                     <template v-slot:footer>
-                        <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false" disabled />
+                        <uni-easyinput v-model="form.totalAmountCapital" placeholder="" :inputBorder="false" disabled />
                     </template>
                     </template>
                 </uni-list-item>
                 </uni-list-item>
                 <uni-list-item title="交付定金、数额、时间">
                 <uni-list-item title="交付定金、数额、时间">
@@ -557,7 +557,7 @@ export default {
             if (this.$refs.productRel && !this.$refs.productRel.validate()) return
             if (this.$refs.productRel && !this.$refs.productRel.validate()) return
             if (!this.validateRequired()) return
             if (!this.validateRequired()) return
             const confirmRes = await new Promise(resolve => {
             const confirmRes = await new Promise(resolve => {
-                uni.showModal({ title: '提示', content: '确定新增经销未锁规合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
+                uni.showModal({ title: '提示', content: '确定新增外贸未锁规合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
             })
             })
             if (!(confirmRes && confirmRes.confirm)) return
             if (!(confirmRes && confirmRes.confirm)) return
             const clean = (obj) => {
             const clean = (obj) => {

@@ -40,7 +40,7 @@
                 </view>
                 </view>
 
 
                 <view class="section">
                 <view class="section">
-                    <view class="row"><text class="label">合计人民币金额（大写）</text><text class="value">{{
+                    <view class="row"><text class="label">合计金额（大写）</text><text class="value">{{
                         detail.totalAmountCapital || '-' }}</text></view>
                         detail.totalAmountCapital || '-' }}</text></view>
                     <view class="row"><text class="label">交付定金、数额、时间</text><text class="value">{{ detail.depositInfo ||
                     <view class="row"><text class="label">交付定金、数额、时间</text><text class="value">{{ detail.depositInfo ||
                         '-' }}</text></view>
                         '-' }}</text></view>
@@ -73,7 +73,9 @@
                 </view>
                 </view>
 
 
                 <view class="section" v-if="detail.status === 'STANDARD'">
                 <view class="section" v-if="detail.status === 'STANDARD'">
-                    <view class="row"><text class="label">规范性合同</text><text class="value" style="color: #3D48A3;">{{
+                    <view class="row"><text class="label">双方盖章合同</text><text class="value act" @click="downloadFile(detail.signedContractFileId, detail.signedContractFileName)">{{
+                        detail.signedContractFileName || '-' }}</text></view>
+                    <view class="row"><text class="label">规范性合同</text><text class="value act" @click="downloadFile(detail.standardFileId, detail.standardFileName)">{{
                         detail.standardFileName || '-'
                         detail.standardFileName || '-'
                             }}</text></view>
                             }}</text></view>
                     <view class="row"><text class="label">合同是否规范</text><text class="value">{{
                     <view class="row"><text class="label">合同是否规范</text><text class="value">{{
@@ -81,7 +83,7 @@
                             }}</text></view>
                             }}</text></view>
                 </view>
                 </view>
                 <view class="section" v-if="detail.status === 'FORMAL'">
                 <view class="section" v-if="detail.status === 'FORMAL'">
-                    <view class="row"><text class="label">规范性合同</text><text class="value" style="color: #3D48A3;">{{
+                    <view class="row"><text class="label">规范性合同</text><text class="value act" @click="downloadFile(detail.formalFileId, detail.formalFileName)">{{
                         detail.formalFileName || '-' }}</text></view>
                         detail.formalFileName || '-' }}</text></view>
                     <view class="row"><text class="label">合同是否规范</text><text class="value">{{ detail.formalStandardized
                     <view class="row"><text class="label">合同是否规范</text><text class="value">{{ detail.formalStandardized
                             ? '是' : '否' }}</text></view>
                             ? '是' : '否' }}</text></view>
@@ -139,6 +141,7 @@ import DetailButtons from '@/components/detail-buttons/index.vue'
 import FileUpload from '@/components/file-upload/index.vue'
 import FileUpload from '@/components/file-upload/index.vue'
 import SingleSelectSheet from '@/components/single-select/index.vue'
 import SingleSelectSheet from '@/components/single-select/index.vue'
 import { fillStandardApprovedName, fillFormalApprovedName } from '@/utils/dic.js'
 import { fillStandardApprovedName, fillFormalApprovedName } from '@/utils/dic.js'
+import { downloadFile } from '@/utils/downloadFile.js'
 
 
 export default {
 export default {
     name: 'ContractForeignUnplanDetail',
     name: 'ContractForeignUnplanDetail',
@@ -301,13 +304,13 @@ export default {
                 { ...this.buttons[4], visible: ((s === 'DRAFT' || s === 'FORMAL') && a !== 'AUDIT' && a !== 'PASS' && this.$auth.hasPermi('contract-manage:foreign-trade-unlocked-contract:upload')) }, //上传正式合同附件
                 { ...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[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[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[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[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[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')) }, //上传双方盖章合同附件
+                { ...this.buttons[13], visible: (s === 'STANDARD' && this.$auth.hasPermi('contract-manage:foreign-trade-unlocked-contract:upload-seal')) }, //上传双方盖章合同附件
+                { ...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')) },         //审核标准合同
             ]
             ]
         }
         }
     },
     },
@@ -385,7 +388,7 @@ export default {
                 })
                 })
                 return
                 return
             }
             }
-            if (!this.standardStandardized && this.uploadType !== 'seal') {
+            if (!this.standardStandardized && this.standardStandardized !== false && this.uploadType !== 'seal') {
                 uni.showToast({
                 uni.showToast({
                     title: '请选择合同是否规范',
                     title: '请选择合同是否规范',
                     icon: 'error'
                     icon: 'error'
@@ -444,6 +447,7 @@ export default {
             const match = (options || []).find(o => String(o.value) === String(current) || String(o.label) === String(current))
             const match = (options || []).find(o => String(o.value) === String(current) || String(o.label) === String(current))
             this.sheet = { ...this.sheet, visible: true, title: '合同是否规范', options, value: match ? match.value : '' }
             this.sheet = { ...this.sheet, visible: true, title: '合同是否规范', options, value: match ? match.value : '' }
         },
         },
+        downloadFile,
         handleButtonClick(btn) {
         handleButtonClick(btn) {
             if (!btn || btn.disabled) return
             if (!btn || btn.disabled) return
             if (typeof btn.onClick === 'function') return btn.onClick(this.detail, btn.params)
             if (typeof btn.onClick === 'function') return btn.onClick(this.detail, btn.params)
@@ -558,6 +562,10 @@ export default {
     &_已签收 {
     &_已签收 {
       background-image: url('~@/static/images/contract/status_4.png');
       background-image: url('~@/static/images/contract/status_4.png');
     }
     }
+
+    &_已取消 {
+      background-image: url('~@/static/images/contract/status_5.png');
+    }
   }
   }
 }
 }
 
 
@@ -577,7 +585,8 @@ export default {
 }
 }
 
 
 .label {
 .label {
-    width: 310rpx;
+    max-width: 310rpx;
+    margin-right: 20rpx;
     color: rgba(0, 0, 0, 0.6);
     color: rgba(0, 0, 0, 0.6);
     font-size: 28rpx;
     font-size: 28rpx;
 }
 }
@@ -587,6 +596,11 @@ export default {
     text-align: right;
     text-align: right;
     color: rgba(0, 0, 0, 0.9);
     color: rgba(0, 0, 0, 0.9);
     font-size: 28rpx;
     font-size: 28rpx;
+    white-space: pre-wrap;
+    word-break: break-all;
+    &.act {
+      color: $theme-primary;
+    }
 }
 }
 
 
 .customer {
 .customer {
@@ -650,4 +664,7 @@ export default {
     color: rgba(0, 0, 0, 0.6);
     color: rgba(0, 0, 0, 0.6);
     font-size: 32rpx;
     font-size: 32rpx;
 }
 }
+.upload-row {
+    margin-top: 20rpx;
+}
 </style>
 </style>

@@ -49,7 +49,7 @@
           <view class="card" @click="goDetail(item)">
           <view class="card" @click="goDetail(item)">
             <view class="card-header">
             <view class="card-header">
               <text class="title omit2">{{ item.buyerName }}</text>
               <text class="title omit2">{{ item.buyerName }}</text>
-              <text v-if="item.status === 'STANDARD'" :class="['status']" :style="{ background: statusMap[item.shippingStatusName] }">{{ item.shippingStatusName }}</text>
+              <text v-if="item.status === 'STANDARD'" :class="['status', 'status_' + item.shippingStatusName]">{{ item.shippingStatusName }}</text>
             </view>
             </view>
             <view class="info-row">
             <view class="info-row">
               <text>编号</text><text>{{ item.code }}</text>
               <text>编号</text><text>{{ item.code }}</text>
@@ -63,7 +63,7 @@
             <view class="info-row" v-if="item.status === 'STANDARD' || item.status === 'FORMAL'">
             <view class="info-row" v-if="item.status === 'STANDARD' || item.status === 'FORMAL'">
               <text>{{ item.status === 'STANDARD' ? '标准合同' : '正式合同' }}规范性审核状态</text>
               <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-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>            
+              <span v-else>-</span>
             </view>
             </view>
             <view class="info-row">
             <view class="info-row">
               <text>订货日期</text><text>{{ item.orderDate }}</text>
               <text>订货日期</text><text>{{ item.orderDate }}</text>
@@ -96,8 +96,7 @@
 <script>
 <script>
 import CardList from '@/components/card/index.vue'
 import CardList from '@/components/card/index.vue'
 import FilterModal from '@/components/filter/index.vue'
 import FilterModal from '@/components/filter/index.vue'
-import { queryContractApi, statusStyle,statusMap } from '@/api/contract.js'
-import { officeQueryApi } from '@/api/devManage.js'
+import { queryContractApi, statusStyle } from '@/api/contract.js'
 
 
 export default {
 export default {
   components: { CardList, FilterModal },
   components: { CardList, FilterModal },
@@ -117,8 +116,7 @@ export default {
       filterVisible: false,
       filterVisible: false,
       filterForm: { deptId: '', deptName: '', dateRange: [] },
       filterForm: { deptId: '', deptName: '', dateRange: [] },
       deptSelectVisible: false,
       deptSelectVisible: false,
-      statusStyle,
-      statusMap,
+      statusStyle
     }
     }
   },
   },
   computed: {
   computed: {
@@ -332,26 +330,30 @@ export default {
             font-size: 30rpx;
             font-size: 30rpx;
             font-weight: 600;
             font-weight: 600;
             position: absolute;
             position: absolute;
-            top: -36rpx;
-            right: -32rpx;
+            top: -32rpx;
+            right: -12rpx;
             height: 48rpx;
             height: 48rpx;
-            line-height: 48rpx;
+            line-height: 50rpx;
             color: #fff;
             color: #fff;
             font-size: 24rpx;
             font-size: 24rpx;
             padding: 0 14rpx;
             padding: 0 14rpx;
             border-radius: 6rpx;
             border-radius: 6rpx;
-            &.status_1 {
+            &_审批中 {
                 background: $theme-primary;
                 background: $theme-primary;
             }
             }
-            &.status_2 {
+            &_生产中 {
                 background: #2BA471;
                 background: #2BA471;
             }
             }
-            &.status_3 {
-                background: #D54941;
+            &_已发货 {
+                background: #E37318;
             }
             }
-            &.status_4 {
-                background: #E7E7E7;
-                color: rgba(0,0,0,0.9);
+            &_已签收 {
+                background: #858A99;
+                color: #ffffff;
+            }
+            &_已取消 {
+                background: #9E9E9E;
+                color: #ffffff;
             }
             }
         }
         }
     }
     }
@@ -382,19 +384,19 @@ export default {
     }
     }
 }
 }
 
 
-.filter-form { 
+.filter-form {
     .form-item { margin-bottom: 24rpx; }
     .form-item { margin-bottom: 24rpx; }
-    .label { 
-        margin-bottom: 20rpx; 
+    .label {
+        margin-bottom: 20rpx;
         color: rgba(0,0,0,0.9);
         color: rgba(0,0,0,0.9);
         height: 44rpx;
         height: 44rpx;
         line-height: 44rpx;
         line-height: 44rpx;
         font-size: 30rpx;
         font-size: 30rpx;
      }
      }
-    .fake-select { 
-        height: 80rpx; line-height: 80rpx; padding: 0 20rpx; background: #f3f3f3; border-radius: 12rpx; 
+    .fake-select {
+        height: 80rpx; line-height: 80rpx; padding: 0 20rpx; background: #f3f3f3; border-radius: 12rpx;
         .placeholder { color: #999; }
         .placeholder { color: #999; }
         .value { color: #333; }
         .value { color: #333; }
     }
     }
 }
 }
-</style>
+</style>

@@ -4,13 +4,8 @@
             <view class="lock-page">
             <view class="lock-page">
                 <view class="block" v-for="(item, idx) in items" :key="idx">
                 <view class="block" v-for="(item, idx) in items" :key="idx">
                     <view class="block-header">
                     <view class="block-header">
-                        <uni-data-checkbox
-                            multiple
-                            mode="default"
-                            :localdata="[{ text: '锁规', value: 'LOCKED' }]"
-                            :modelValue="item.locked ? ['LOCKED'] : []"
-                            @change="onLockChange(idx, $event)"
-                        />
+                        <uni-data-checkbox multiple mode="default" :localdata="[{ text: '锁规', value: 'LOCKED' }]"
+                            :modelValue="item.locked ? ['LOCKED'] : []" @change="onLockChange(idx, $event)" />
                         <view class="ops" @click="toggleItem(idx)">
                         <view class="ops" @click="toggleItem(idx)">
                             <image class="opIcon"
                             <image class="opIcon"
                                 :src="item.collapsed ? '/static/images/up.png' : '/static/images/down.png'" />
                                 :src="item.collapsed ? '/static/images/up.png' : '/static/images/down.png'" />
@@ -21,12 +16,14 @@
                     <uni-list v-show="item.collapsed">
                     <uni-list v-show="item.collapsed">
                         <uni-list-item title="产品名称">
                         <uni-list-item title="产品名称">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput v-model="item.productName" placeholder="请输入产品名称" :clearable="false" disabled />
+                                <uni-easyinput v-model="item.productName" placeholder="请输入产品名称" :clearable="false"
+                                    disabled />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="行业">
                         <uni-list-item title="行业">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput v-model="item.industry" placeholder="请输入行业" :clearable="false" disabled />
+                                <uni-easyinput v-model="item.industry" placeholder="请输入行业" :clearable="false"
+                                    disabled />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="牌号">
                         <uni-list-item title="牌号">
@@ -41,28 +38,39 @@
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="规格(mm)">
                         <uni-list-item title="规格(mm)">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <!-- <uni-easyinput v-model="item.specDisplay" placeholder="自动拼接规格" :clearable="false" disabled /> -->
-                            <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 class="value value-spec">
+                                    <view v-if="item.thickness" class="value-spec_val">{{ item.thickness }}</view>
+                                    <view v-if="item.thickness" class="value-spec_box">
+                                        <view v-if="item.thicknessTolPos" class="value-spec_box_1">{{
+                                            item.thicknessTolPos > 0 ? '+' + item.thicknessTolPos : item.thicknessTolPos
+                                            }}
+                                        </view>
+                                        <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{
+                                            item.thicknessTolNeg > 0 ? '+' + item.thicknessTolNeg : item.thicknessTolNeg
+                                            }}
+                                        </view>
+                                    </view>
+                                    <view v-if="item.width" class="value-spec_val p12">*</view>
+                                    <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
+                                    <view v-if="item.width" class="value-spec_box">
+                                        <view v-if="item.widthTolPos" class="value-spec_box_1">{{ item.widthTolPos > 0 ?
+                                            '+' + item.widthTolPos : item.widthTolPos }}
+                                        </view>
+                                        <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg > 0 ?
+                                            '+' + item.widthTolNeg : item.widthTolNeg }}
+                                        </view>
+                                    </view>
+                                    <view v-if="item.length" class="value-spec_val p12">*</view>
+                                    <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
+                                    <view v-if="item.length" class="value-spec_box">
+                                        <view v-if="item.lengthTolPos" class="value-spec_box_1">{{ item.lengthTolPos > 0
+                                            ? '+' + item.lengthTolPos : item.lengthTolPos }}
+                                        </view>
+                                        <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg > 0
+                                            ? '+' + item.lengthTolNeg : item.lengthTolNeg }}
+                                        </view>
+                                    </view>
                                 </view>
                                 </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>
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="状态">
                         <uni-list-item title="状态">
@@ -72,27 +80,32 @@
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="数量">
                         <uni-list-item title="数量">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput v-model="item.quantity" type="number" :inputBorder="false" placeholder="请输入数量" @input="onImmediateChange(idx)" @blur="onNumberBlur(idx, 'quantity', 0)" />
+                                <uni-easyinput v-model="item.quantity" type="number" :inputBorder="false"
+                                    placeholder="请输入数量" @input="onImmediateChange(idx)"
+                                    @blur="onNumberBlur(idx, 'quantity', 0)" />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="单价">
                         <uni-list-item title="单价">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput v-model="item.unitPrice" type="number" :inputBorder="false" placeholder="请输入单价" @input="onImmediateChange(idx)" @blur="onNumberBlur(idx, 'unitPrice', 0)" />
+                                <uni-easyinput v-model="item.unitPrice" type="number" :inputBorder="false"
+                                    placeholder="请输入单价" @input="onImmediateChange(idx)"
+                                    @blur="onNumberBlur(idx, 'unitPrice', 0)" />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                         <!-- <uni-list-item title="不含税金额">
                         <!-- <uni-list-item title="不含税金额">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput v-model="item.amountExcludingTax" type="number" :inputBorder="false" disabled placeholder="自动计算" />
+                                <uni-easyinput v-model="item.amountExcludingTax" type="number" :inputBorder="false" disabled placeholder="" />
                             </template>
                             </template>
                         </uni-list-item> -->
                         </uni-list-item> -->
                         <uni-list-item title="总金额">
                         <uni-list-item title="总金额">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput v-model="item.totalAmount" type="number" :inputBorder="false" disabled placeholder="自动计算" />
+                                <uni-easyinput v-model="item.totalAmount" type="number" :inputBorder="false" disabled
+                                    placeholder="" />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="发货日期">
                         <uni-list-item title="发货日期">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput v-model="item.deliveryDate"  :inputBorder="false" disabled  />
+                                <uni-easyinput v-model="item.deliveryDate" :inputBorder="false" disabled />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                     </uni-list>
                     </uni-list>
@@ -100,12 +113,14 @@
                     <uni-list v-show="!item.collapsed">
                     <uni-list v-show="!item.collapsed">
                         <uni-list-item title="产品名称">
                         <uni-list-item title="产品名称">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput v-model="item.productName" placeholder="请输入产品名称" :clearable="false" disabled />
+                                <uni-easyinput v-model="item.productName" placeholder="请输入产品名称" :clearable="false"
+                                    disabled />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="行业">
                         <uni-list-item title="行业">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput v-model="item.industry" placeholder="请输入行业" :clearable="false" disabled />
+                                <uni-easyinput v-model="item.industry" placeholder="请输入行业" :clearable="false"
+                                    disabled />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="牌号">
                         <uni-list-item title="牌号">
@@ -113,40 +128,41 @@
                                 <uni-easyinput v-model="item.brand" placeholder="请输入牌号" :clearable="false" disabled />
                                 <uni-easyinput v-model="item.brand" placeholder="请输入牌号" :clearable="false" disabled />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
-                        <view class="footer">
-                            <div class="total">
-                                <div class="total-text">
-                                    合计
-                                </div>
-                                <div class="total-item">
-                                    <div class="total-item-text">
-                                        数量
-                                    </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">
-                                        ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}
-                                    </div>
-                                </div> -->
-                                <div class="total-item">
-                                    <div class="total-item-text">
-                                        总金额
-                                    </div>
-                                    <div class="total-item-price text-red">
-                                        ￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}
-                                    </div>
-                                </div>
-                            </div>
-                            <button class="btn submit" type="primary" @click="onSubmit">提交</button>
-                        </view>
+                        
                     </uni-list>
                     </uni-list>
                 </view>
                 </view>
+                <view class="footer">
+                    <div class="total">
+                        <div class="total-text">
+                            合计
+                        </div>
+                        <div class="total-item">
+                            <div class="total-item-text">
+                                数量
+                            </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">
+                                ￥{{ (totalAmountExcludingTax || 0).toFixed(2) }}
+                            </div>
+                        </div> -->
+                        <div class="total-item">
+                            <div class="total-item-text">
+                                总金额
+                            </div>
+                            <div class="total-item-price text-red">
+                                ￥{{ (totalAmountIncludingTax || 0).toFixed(2) }}
+                            </div>
+                        </div>
+                    </div>
+                    <button class="btn submit" type="primary" @click="onSubmit">提交</button>
+                </view>
             </view>
             </view>
         </scroll-view>
         </scroll-view>
 
 
@@ -166,7 +182,7 @@ export default {
             planQty: 30,
             planQty: 30,
         }
         }
     },
     },
-  computed: {
+    computed: {
         totalQuantity() {
         totalQuantity() {
             const qty = this.items.filter(it => it.locked).reduce((p, c) => p + this.toNumber(c.quantity), 0)
             const qty = this.items.filter(it => it.locked).reduce((p, c) => p + this.toNumber(c.quantity), 0)
             return this.round(qty, 2)
             return this.round(qty, 2)
@@ -349,7 +365,7 @@ export default {
                 // totalAmountExcludingTax: this.totalAmountExcludingTax,
                 // totalAmountExcludingTax: this.totalAmountExcludingTax,
                 totalAmountIncludingTax: this.totalAmountIncludingTax,
                 totalAmountIncludingTax: this.totalAmountIncludingTax,
                 totalQuantity: this.totalQuantity,
                 totalQuantity: this.totalQuantity,
-                type:'INTL_OPEN_SPEC_AGMT',
+                type: 'INTL_OPEN_SPEC_AGMT',
                 contractDistributorLineList: selected
                 contractDistributorLineList: selected
             }
             }
 
 
@@ -364,7 +380,7 @@ export default {
                                 uni.navigateTo({ url: '/pages/contract_foreign_unplan/index' })
                                 uni.navigateTo({ url: '/pages/contract_foreign_unplan/index' })
                             }, 500)
                             }, 500)
                         }).catch((err) => {
                         }).catch((err) => {
-                            uni.showToast({ title: err.msg ||'提交失败', icon: 'none' })
+                            uni.showToast({ title: err.msg || '提交失败', icon: 'none' })
                         })
                         })
                     }
                     }
                 }
                 }
@@ -423,6 +439,7 @@ export default {
     width: 36rpx;
     width: 36rpx;
     height: 36rpx;
     height: 36rpx;
 }
 }
+
 .block-header ::v-deep .uni-data-checklist .checklist-text {
 .block-header ::v-deep .uni-data-checklist .checklist-text {
     font-size: 28rpx;
     font-size: 28rpx;
     margin-left: 12rpx;
     margin-left: 12rpx;
@@ -555,6 +572,7 @@ export default {
 ::v-deep .is-disabled {
 ::v-deep .is-disabled {
     background-color: transparent !important;
     background-color: transparent !important;
 }
 }
+
 // ::v-deep .uni-list-item__content-title {
 // ::v-deep .uni-list-item__content-title {
 //     font-size: 28rpx;
 //     font-size: 28rpx;
 //     color: rgba(0, 0, 0, 0.9);
 //     color: rgba(0, 0, 0, 0.9);
@@ -720,42 +738,45 @@ export default {
     background: $theme-primary;
     background: $theme-primary;
     color: #fff;
     color: #fff;
 }
 }
+
 .value-spec {
 .value-spec {
+    height: 48rpx;
+    display: flex;
+    align-items: center;
+    color: #000000;
+
+    // justify-content: end;
+    &_box {
+        position: relative;
+        width: 60rpx;
         height: 48rpx;
         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;
-            }
+        &_1 {
+            font-size: 16rpx;
+            position: absolute;
+            top: -10rpx;
+            left: 0;
         }
         }
 
 
-        &_val {
-            font-size: 28rpx;
-
-            &.p12 {
-                padding-right: 12rpx;
-            }
+        &_2 {
+            font-size: 16rpx;
+            position: absolute;
+            bottom: -10rpx;
+            left: 0;
         }
         }
     }
     }
-        .row-spec {
-            height: 60rpx;
-            align-items: center;
+
+    &_val {
+        font-size: 28rpx;
+
+        &.p12 {
+            padding-right: 12rpx;
         }
         }
+    }
+}
+
+.row-spec {
+    height: 60rpx;
+    align-items: center;
+}
 </style>
 </style>

@@ -56,7 +56,7 @@
                     <uni-list>
                     <uni-list>
                         <uni-list-item title="现申请锁规格日期">
                         <uni-list-item title="现申请锁规格日期">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-datetime-picker type="date" v-model="form.specLockDate" />
+                                <uni-datetime-picker :start="minDate" type="date" v-model="form.specLockDate" />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="延迟原因">
                         <uni-list-item title="延迟原因">
@@ -97,6 +97,16 @@ export default {
             form: { specLockDate: '', delayReason: '' }
             form: { specLockDate: '', delayReason: '' }
         }
         }
     },
     },
+    computed: {
+        minDate() {
+            const now = new Date()
+            now.setDate(now.getDate() + 1)
+            const y = now.getFullYear()
+            const m = String(now.getMonth() + 1).padStart(2, '0')
+            const d = String(now.getDate()).padStart(2, '0')
+            return `${y}-${m}-${d}`
+        }
+    },
     onLoad(options) {
     onLoad(options) {
         const id = options && options.id ? options.id : ''
         const id = options && options.id ? options.id : ''
         this.id = id
         this.id = id

@@ -66,9 +66,9 @@
 
 
                 <ProductRel ref="productRel" mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" :list="productLineList" @change="onProductsChange" :options="productList" />
                 <ProductRel ref="productRel" mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" :list="productLineList" @change="onProductsChange" :options="productList" />
 
 
-                <uni-list-item title="合计人民币金额（大写）">
+                <uni-list-item title="合计金额（大写）">
                     <template v-slot:footer>
                     <template v-slot:footer>
-                        <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false"
+                        <uni-easyinput v-model="form.totalAmountCapital" placeholder="" :inputBorder="false"
                             disabled />
                             disabled />
                     </template>
                     </template>
                 </uni-list-item>
                 </uni-list-item>
@@ -533,7 +533,7 @@ export default {
             if (!this.validateRequired()) return
             if (!this.validateRequired()) return
             if (this.$refs.productRel && !this.$refs.productRel.validate()) return
             if (this.$refs.productRel && !this.$refs.productRel.validate()) return
             const confirmRes = await new Promise(resolve => {
             const confirmRes = await new Promise(resolve => {
-                uni.showModal({ title: '提示', content: '确定保存当前经销未锁规合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
+                uni.showModal({ title: '提示', content: '确定保存当前外贸未锁规合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
             })
             })
             if (!(confirmRes && confirmRes.confirm)) return
             if (!(confirmRes && confirmRes.confirm)) return
             const clean = (obj) => {
             const clean = (obj) => {

@@ -7,7 +7,7 @@
                 <image v-if="mode === 'add'" class="opAdd" @click="onAdd" src="/static/images/plus.png"  />
                 <image v-if="mode === 'add'" class="opAdd" @click="onAdd" src="/static/images/plus.png"  />
                 <view v-if="mode === 'view'" class="op1"  @click="toggleViewCollapse">
                 <view v-if="mode === 'view'" class="op1"  @click="toggleViewCollapse">
                     <image class="opAdd"  :src="collapsedView ? '/static/images/down.png' : '/static/images/up.png'"  />
                     <image class="opAdd"  :src="collapsedView ? '/static/images/down.png' : '/static/images/up.png'"  />
-                    <text  class="op">{{ collapsedView ? '展开' : '收起'}} </text> 
+                    <text  class="op">{{ collapsedView ? '展开' : '收起'}} </text>
                 </view>
                 </view>
 
 
             </view>
             </view>
@@ -61,13 +61,13 @@
                     <uni-list-item title="厚度公差上限(mm)">
                     <uni-list-item title="厚度公差上限(mm)">
                         <template v-slot:footer>
                         <template v-slot:footer>
                             <uni-easyinput type="digit" v-model="item.thicknessTolPos" :inputBorder="false"
                             <uni-easyinput type="digit" v-model="item.thicknessTolPos" :inputBorder="false"
-                                placeholder="请输入厚度公差上限" @input="onNonNegativeInput(idx, 'thicknessTolPos')" @blur="onNonNegativeBlur(idx, 'thicknessTolPos', 9)" />
+                                placeholder="请输入厚度公差上限" @input="onNumberInput(idx, 'thicknessTolPos')" @blur="onNumberBlur(idx, 'thicknessTolPos', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="厚度公差下限(mm)">
                     <uni-list-item title="厚度公差下限(mm)">
                         <template v-slot:footer>
                         <template v-slot:footer>
                             <uni-easyinput type="digit" v-model="item.thicknessTolNeg" :inputBorder="false"
                             <uni-easyinput type="digit" v-model="item.thicknessTolNeg" :inputBorder="false"
-                                placeholder="请输入厚度公差下限" @input="onNonNegativeInput(idx, 'thicknessTolNeg')" @blur="onNonNegativeBlur(idx, 'thicknessTolNeg', 9)" />
+                                placeholder="请输入厚度公差下限" @input="onNumberInput(idx, 'thicknessTolNeg')" @blur="onNumberBlur(idx, 'thicknessTolNeg', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="宽度(mm)">
                     <uni-list-item title="宽度(mm)">
@@ -77,12 +77,12 @@
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="宽度公差上限(mm)">
                     <uni-list-item title="宽度公差上限(mm)">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput type="digit" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差上限" @input="onNonNegativeInput(idx, 'widthTolPos')" @blur="onNonNegativeBlur(idx, 'widthTolPos', 9)" />
+                            <uni-easyinput type="digit" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差上限" @input="onNumberInput(idx, 'widthTolPos')" @blur="onNumberBlur(idx, 'widthTolPos', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="宽度公差下限(mm)">
                     <uni-list-item title="宽度公差下限(mm)">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput type="digit" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差下限" @input="onNonNegativeInput(idx, 'widthTolNeg')" @blur="onNonNegativeBlur(idx, 'widthTolNeg', 9)" />
+                            <uni-easyinput type="digit" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差下限" @input="onNumberInput(idx, 'widthTolNeg')" @blur="onNumberBlur(idx, 'widthTolNeg', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="长度(mm)">
                     <uni-list-item title="长度(mm)">
@@ -93,13 +93,13 @@
                     <uni-list-item title="长度公差上限(mm)">
                     <uni-list-item title="长度公差上限(mm)">
                         <template v-slot:footer>
                         <template v-slot:footer>
                             <uni-easyinput type="digit" v-model="item.lengthTolPos" :inputBorder="false"
                             <uni-easyinput type="digit" v-model="item.lengthTolPos" :inputBorder="false"
-                                placeholder="请输入长度公差上限" @input="onNonNegativeInput(idx, 'lengthTolPos')" @blur="onNonNegativeBlur(idx, 'lengthTolPos', 9)" />
+                                placeholder="请输入长度公差上限" @input="onNumberInput(idx, 'lengthTolPos')" @blur="onNumberBlur(idx, 'lengthTolPos', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="长度公差下限(mm)">
                     <uni-list-item title="长度公差下限(mm)">
                         <template v-slot:footer>
                         <template v-slot:footer>
                             <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false"
                             <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false"
-                                placeholder="请输入长度公差下限" @input="onNonNegativeInput(idx, 'lengthTolNeg')" @blur="onNonNegativeBlur(idx, 'lengthTolNeg', 9)" />
+                                placeholder="请输入长度公差下限" @input="onNumberInput(idx, 'lengthTolNeg')" @blur="onNumberBlur(idx, 'lengthTolNeg', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="状态">
                     <uni-list-item title="状态">
@@ -109,7 +109,7 @@
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="数量">
                     <uni-list-item title="数量">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.quantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'quantity')" @blur="onNonNegativeBlur(idx, 'quantity', 9)" />
+                            <uni-easyinput v-model="item.quantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'quantity')" @blur="onNonNegativeBlur(idx, 'quantity', 2)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="单价">
                     <uni-list-item title="单价">
@@ -119,17 +119,17 @@
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="外贸加工费">
                     <uni-list-item title="外贸加工费">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.processingFee" type="number" :inputBorder="false" placeholder="请输入外贸加工费" />
+                            <uni-easyinput v-model="item.processingFee" type="digit" :inputBorder="false" placeholder="请输入外贸加工费" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <!-- <uni-list-item title="不含税金额">
                     <!-- <uni-list-item title="不含税金额">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.amountExcludingTax" type="number" :inputBorder="false" disabled placeholder="自动计算" />
+                            <uni-easyinput v-model="item.amountExcludingTax" type="number" :inputBorder="false" disabled placeholder="" />
                         </template>
                         </template>
                     </uni-list-item> -->
                     </uni-list-item> -->
                     <uni-list-item title="总金额">
                     <uni-list-item title="总金额">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.totalAmount" type="number" :inputBorder="false" disabled placeholder="自动计算" />
+                            <uni-easyinput v-model="item.totalAmount" type="number" :inputBorder="false" disabled placeholder="" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="发货日期">
                     <uni-list-item title="发货日期">
@@ -158,27 +158,27 @@
                 <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.quality }}</text></view>
                     <!-- 厚（公差） * 宽（公差） * 长（公差） -->
                     <!-- 厚（公差） * 宽（公差） * 长（公差） -->
                     <view class="row row-spec"><text class="label">规格(mm)</text>
                     <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 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 ? '+' + item.thicknessTolPos : item.thicknessTolPos }}
+                          </view>
+                          <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg ? '+' + item.thicknessTolNeg : item.thicknessTolNeg }}
+                          </view>
                         </view>
                         </view>
+                        <view v-if="item.width" class="value-spec_val p12">*</view>
+                        <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
+                        <view v-if="item.width" class="value-spec_box">
+                          <view v-if="item.widthTolPos" class="value-spec_box_1">{{ item.widthTolPos > 0 ? '+' + item.widthTolPos : item.widthTolPos }}</view>
+                          <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg > 0 ? '+' + item.widthTolNeg : item.widthTolNeg }}</view>
+                        </view>
+                        <view v-if="item.length" class="value-spec_val p12">*</view>
+                        <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
+                        <view v-if="item.length" class="value-spec_box">
+                          <view v-if="item.lengthTolPos" class="value-spec_box_1">{{ item.lengthTolPos > 0 ? '+' + item.lengthTolPos : item.lengthTolPos }}</view>
+                          <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg > 0 ? '+' + item.lengthTolNeg : item.lengthTolNeg }}</view>
+                        </view>
+                      </view>
                     </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.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">{{ item.quantity }}</text></view>
@@ -232,12 +232,10 @@ export default {
       const m = Number(parts[1])
       const m = Number(parts[1])
       const d = Number(parts[2])
       const d = Number(parts[2])
       if (!y || !m || !d) return ''
       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}`
+      const yy = y
+      const mm = String(m).padStart(2, '0')
+      const dd = String(d).padStart(2, '0')
+      return `${yy}-${mm}-${dd}`
     }
     }
   },
   },
   watch: {
   watch: {
@@ -341,13 +339,13 @@ export default {
                     }
                     }
                     return null
                     return null
                 }
                 }
-                
+
                 let err = check(it.thicknessTolPos, it.thicknessTolNeg, '厚度')
                 let err = check(it.thicknessTolPos, it.thicknessTolNeg, '厚度')
                 if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
                 if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
-                
+
                 err = check(it.widthTolPos, it.widthTolNeg, '宽度')
                 err = check(it.widthTolPos, it.widthTolNeg, '宽度')
                 if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
                 if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
-                
+
                 err = check(it.lengthTolPos, it.lengthTolNeg, '长度')
                 err = check(it.lengthTolPos, it.lengthTolNeg, '长度')
                 if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
                 if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
             }
             }
@@ -399,7 +397,7 @@ export default {
             this.emitChange()
             this.emitChange()
         },
         },
         recalculate(idx) {
         recalculate(idx) {
-            const TAX_RATE = 0.13
+            // const TAX_RATE = 0.13
             const it = this.items[idx]
             const it = this.items[idx]
             if (!it) return
             if (!it) return
             const qty = this.toNumber(it.quantity)
             const qty = this.toNumber(it.quantity)

@@ -49,6 +49,8 @@
 
 
     <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value"
     <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value"
       @confirm="onSheetConfirm" />
       @confirm="onSheetConfirm" />
+    <MultiSelectSheet :visible.sync="multiSheet.visible" :title="multiSheet.title" :options="multiSheet.options" v-model="multiSheet.value"
+      @confirm="onMultiSheetConfirm" />
 
 
     <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source"
     <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source"
       :display-fields="relate.display" :multiple="relate.multiple" :row-key="relate.rowKey"
       :display-fields="relate.display" :multiple="relate.multiple" :row-key="relate.rowKey"
@@ -57,12 +59,13 @@
 </template>
 </template>
 <script>
 <script>
 import SingleSelectSheet from '@/components/single-select/index.vue'
 import SingleSelectSheet from '@/components/single-select/index.vue'
+import MultiSelectSheet from '@/components/multi-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
 import { productVarietyQuery, getCodeApi, createApi } from '@/api/contract'
 import { productVarietyQuery, getCodeApi, createApi } from '@/api/contract'
 import { getDicByCodes } from '@/utils/dic'
 import { getDicByCodes } from '@/utils/dic'
 
 
 export default {
 export default {
-  components: { SingleSelectSheet, RelateSelectSheet },
+  components: { SingleSelectSheet, RelateSelectSheet, MultiSelectSheet },
   data() {
   data() {
     return {
     return {
       form: {
       form: {
@@ -73,13 +76,14 @@ export default {
         companyName: '',
         companyName: '',
         materialTypeId: '',
         materialTypeId: '',
         materialTypeIdName: '',
         materialTypeIdName: '',
-        hasFrameworkAgreement: '',
-        hasFrameworkAgreementName: '',
+        hasFrameworkAgreement: true,
+        hasFrameworkAgreementName: '是',
         validityTime: ''
         validityTime: ''
       },
       },
       productVarietyList: [],
       productVarietyList: [],
       companyList: [],
       companyList: [],
       sheet: { visible: false, title: '请选择', field: '', options: [], value: '' },
       sheet: { visible: false, title: '请选择', field: '', options: [], value: '' },
+      multiSheet: { visible: false, title: '请选择', field: '', options: [], value: '' },
       relate: { visible: false, title: '选择', source: '', display: [], multiple: false, rowKey: 'id', selectedKeys: [], fieldKey: '' }
       relate: { visible: false, title: '选择', source: '', display: [], multiple: false, rowKey: 'id', selectedKeys: [], fieldKey: '' }
     }
     }
   },
   },
@@ -132,14 +136,25 @@ export default {
         const match = (options || []).find(o => String(o.label) === String(current) || String(o.value) === String(current))
         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 : '' }
         this.sheet = { ...this.sheet, visible: true, title, options, field, value: match ? match.value : '' }
       }
       }
+      const setMultiSheet = (title, options) => {
+        const current = this.form[field]
+        this.multiSheet = { ...this.multiSheet, visible: true, title, options, field, value: current || '' }
+      }
+
       if (field === 'company') {
       if (field === 'company') {
         setSheet('所属单位', this.companyList)
         setSheet('所属单位', this.companyList)
       } else if (field === 'materialTypeId') {
       } else if (field === 'materialTypeId') {
-        setSheet('品种', this.productVarietyList)
+        setMultiSheet('品种', this.productVarietyList)
       } else if (field === 'hasFrameworkAgreement') {
       } else if (field === 'hasFrameworkAgreement') {
         setSheet('是否签订框架合同', [{ label: '是', value: true }, { label: '否', value: false }])
         setSheet('是否签订框架合同', [{ label: '是', value: true }, { label: '否', value: false }])
       }
       }
     },
     },
+    onMultiSheetConfirm({ value, label }) {
+      const field = this.multiSheet.field
+      if (!field) return
+      this.form[field] = value || ''
+      this.form[field + 'Name'] = label || ''
+    },
     onSheetConfirm({ value, label }) {
     onSheetConfirm({ value, label }) {
       const field = this.sheet.field
       const field = this.sheet.field
       if (!field) return
       if (!field) return

@@ -120,6 +120,8 @@ export default {
     font-size: 28rpx;
     font-size: 28rpx;
     color: rgba(0, 0, 0, 0.9);
     color: rgba(0, 0, 0, 0.9);
     text-align: right;
     text-align: right;
+    white-space: pre-wrap;
+    word-break: break-all;
   }
   }
 }
 }
 </style>
 </style>

@@ -82,10 +82,20 @@ export default {
 
 
   },
   },
   computed: {
   computed: {
-
+    extraCombined() {
+      return {
+        keyword: this.searchKeywordDebounced || undefined
+      }
+    }
   },
   },
   watch: {
   watch: {
-
+    extraCombined: {
+      deep: true,
+      handler(v) {
+        this.extraParams = v
+      },
+      immediate: true
+    }
   },
   },
   created() {
   created() {
     this.getProductVariety();
     this.getProductVariety();
@@ -128,7 +138,7 @@ export default {
       }
       }
       // 关键字（使用去抖后的值避免频繁触发）
       // 关键字（使用去抖后的值避免频繁触发）
       if (this.searchKeywordDebounced) {
       if (this.searchKeywordDebounced) {
-        params.customerName = this.searchKeywordDebounced
+        params.keyword = this.searchKeywordDebounced
       }
       }
       return queryApi(params)
       return queryApi(params)
         .then(res => {
         .then(res => {
@@ -282,7 +292,7 @@ export default {
       font-weight: 600;
       font-weight: 600;
       position: absolute;
       position: absolute;
       top: -36rpx;
       top: -36rpx;
-      right: -32rpx;
+      right: -12rpx;
       height: 48rpx;
       height: 48rpx;
       line-height: 48rpx;
       line-height: 48rpx;
       color: #fff;
       color: #fff;
@@ -402,4 +412,4 @@ export default {
   }
   }
 
 
 }
 }
-</style>
+</style>

@@ -49,6 +49,8 @@
 
 
     <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value"
     <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value"
       @confirm="onSheetConfirm" />
       @confirm="onSheetConfirm" />
+    <MultiSelectSheet :visible.sync="multiSheet.visible" :title="multiSheet.title" :options="multiSheet.options" v-model="multiSheet.value"
+      @confirm="onMultiSheetConfirm" />
     <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source"
     <RelateSelectSheet :visible.sync="relate.visible" :title="relate.title" :source="relate.source"
       :display-fields="relate.display" :multiple="relate.multiple" :row-key="relate.rowKey"
       :display-fields="relate.display" :multiple="relate.multiple" :row-key="relate.rowKey"
       :selectedKeys.sync="relate.selectedKeys" @confirm="onRelateConfirm" />
       :selectedKeys.sync="relate.selectedKeys" @confirm="onRelateConfirm" />
@@ -57,12 +59,13 @@
 
 
 <script>
 <script>
 import SingleSelectSheet from '@/components/single-select/index.vue'
 import SingleSelectSheet from '@/components/single-select/index.vue'
+import MultiSelectSheet from '@/components/multi-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
 import { productVarietyQuery, getCodeApi, getDetailApi, updateApi } from '@/api/contract'
 import { productVarietyQuery, getCodeApi, getDetailApi, updateApi } from '@/api/contract'
 import { getDicByCodes } from '@/utils/dic'
 import { getDicByCodes } from '@/utils/dic'
 
 
 export default {
 export default {
-  components: { SingleSelectSheet, RelateSelectSheet },
+  components: { SingleSelectSheet, RelateSelectSheet, MultiSelectSheet },
   data() {
   data() {
     return {
     return {
       id: '',
       id: '',
@@ -70,6 +73,7 @@ export default {
       companyList: [],
       companyList: [],
       productVarietyList: [],
       productVarietyList: [],
       sheet: { visible: false, title: '请选择', field: '', options: [], value: '' },
       sheet: { visible: false, title: '请选择', field: '', options: [], value: '' },
+      multiSheet: { visible: false, title: '请选择', field: '', options: [], value: '' },
       relate: { visible: false, title: '选择', source: '', display: [], multiple: false, rowKey: 'id', selectedKeys: [], fieldKey: '' }
       relate: { visible: false, title: '选择', source: '', display: [], multiple: false, rowKey: 'id', selectedKeys: [], fieldKey: '' }
     }
     }
   },
   },
@@ -122,10 +126,21 @@ export default {
         const match = (options || []).find(o => String(o.value) === String(current))
         const match = (options || []).find(o => String(o.value) === String(current))
         this.sheet = { ...this.sheet, visible: true, title, options, field, value: match ? match.value : '' }
         this.sheet = { ...this.sheet, visible: true, title, options, field, value: match ? match.value : '' }
       }
       }
+      const setMultiSheet = (title, options) => {
+        const current = this.form[field]
+        this.multiSheet = { ...this.multiSheet, visible: true, title, options, field, value: current || '' }
+      }
+
       if (field === 'company') setSheet('所属单位', this.companyList)
       if (field === 'company') setSheet('所属单位', this.companyList)
-      else if (field === 'materialTypeId') setSheet('品种', this.productVarietyList)
+      else if (field === 'materialTypeId') setMultiSheet('品种', this.productVarietyList)
       else if (field === 'hasFrameworkAgreement') setSheet('是否签订框架合同', [{ label: '是', value: true }, { label: '否', value: false }])
       else if (field === 'hasFrameworkAgreement') setSheet('是否签订框架合同', [{ label: '是', value: true }, { label: '否', value: false }])
     },
     },
+    onMultiSheetConfirm({ value, label }) {
+      const field = this.multiSheet.field
+      if (!field) return
+      this.form[field] = value || ''
+      this.form[field + 'Name'] = label || ''
+    },
     onSheetConfirm({ value, label }) {
     onSheetConfirm({ value, label }) {
       const field = this.sheet.field
       const field = this.sheet.field
       if (!field) return
       if (!field) return

@@ -61,10 +61,10 @@
                     <view class="item-title"><text class="required">*</text><text>区域</text></view>
                     <view class="item-title"><text class="required">*</text><text>区域</text></view>
                 </template>
                 </template>
                 </uni-list-item>
                 </uni-list-item>
-                <ProductRel ref="productRel" mode="add" :deliveryDateBase="form.deliveryDate" :deliveryDate="form.orderDate" @change="onProductsChange" :options="productList" :rawToProdRatioList="rawToProdRatioList" />
-                <uni-list-item title="合计人民币金额（大写）">
+                <ProductRel ref="productRel" mode="add" :deliveryDateBase="form.deliveryDate" :deliveryDate="form.orderDate" @change="onProductsChange" :options="productList" :rawToProdRatioList="rawToProdRatioList" :rawProductList="rawProductList" :rawProductGradeList="rawProductGradeList" />
+                <uni-list-item title="合计金额（大写）">
                     <template v-slot:footer>
                     <template v-slot:footer>
-                        <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false" disabled />
+                        <uni-easyinput v-model="form.totalAmountCapital" placeholder="" :inputBorder="false" disabled />
                     </template>
                     </template>
                 </uni-list-item>
                 </uni-list-item>
                 <uni-list-item title="交付定金、数额、时间">
                 <uni-list-item title="交付定金、数额、时间">
@@ -295,6 +295,8 @@ export default {
             defaultRemark: '',
             defaultRemark: '',
             regionOptions: [],
             regionOptions: [],
             rawToProdRatioList: [],
             rawToProdRatioList: [],
+            rawProductList: [],
+            rawProductGradeList: [],
         }
         }
     },
     },
     created() {
     created() {
@@ -441,20 +443,26 @@ export default {
         },
         },
         async loadExtraOptions() {
         async loadExtraOptions() {
             try {
             try {
-                const results = await getDicByCodes(['CONDITIONS_REQUIRED', 'APPLICABLE_STANDARD', 'CONTRACT_PRODUCT','RAW_TO_PROD_RATIO'])
+                const results = await getDicByCodes(['CONDITIONS_REQUIRED', 'APPLICABLE_STANDARD', 'CONTRACT_PRODUCT','RAW_TO_PROD_RATIO', 'RAW_MATERIAL', 'RAW_MATERIAL_GRADE'])
                 const c1 = results && results.CONDITIONS_REQUIRED && results.CONDITIONS_REQUIRED.data ? results.CONDITIONS_REQUIRED.data : []
                 const c1 = results && results.CONDITIONS_REQUIRED && results.CONDITIONS_REQUIRED.data ? results.CONDITIONS_REQUIRED.data : []
                 const c2 = results && results.APPLICABLE_STANDARD && results.APPLICABLE_STANDARD.data ? results.APPLICABLE_STANDARD.data : []
                 const c2 = results && results.APPLICABLE_STANDARD && results.APPLICABLE_STANDARD.data ? results.APPLICABLE_STANDARD.data : []
                 const c3 = results && results.CONTRACT_PRODUCT && results.CONTRACT_PRODUCT.data ? results.CONTRACT_PRODUCT.data : []
                 const c3 = results && results.CONTRACT_PRODUCT && results.CONTRACT_PRODUCT.data ? results.CONTRACT_PRODUCT.data : []
                 const c4 = results && results.RAW_TO_PROD_RATIO && results.RAW_TO_PROD_RATIO.data ? results.RAW_TO_PROD_RATIO.data : []
                 const c4 = results && results.RAW_TO_PROD_RATIO && results.RAW_TO_PROD_RATIO.data ? results.RAW_TO_PROD_RATIO.data : []
+                const c5 = results && results.RAW_MATERIAL && results.RAW_MATERIAL.data ? results.RAW_MATERIAL.data : []
+                const c6 = results && results.RAW_MATERIAL_GRADE && results.RAW_MATERIAL_GRADE.data ? results.RAW_MATERIAL_GRADE.data : []
                 this.specialTermsList = c1.map(it => ({ label: it.name, value: it.code }))
                 this.specialTermsList = c1.map(it => ({ label: it.name, value: it.code }))
                 this.executionStandardList = c2.map(it => ({ label: it.name, value: it.code }))
                 this.executionStandardList = c2.map(it => ({ label: it.name, value: it.code }))
                 this.productList = c3.map(it => ({ label: it.name, value: it.code }))
                 this.productList = c3.map(it => ({ label: it.name, value: it.code }))
                 this.rawToProdRatioList = c4.map(it => ({ label: it.name, value: it.code }))
                 this.rawToProdRatioList = c4.map(it => ({ label: it.name, value: it.code }))
+                this.rawProductList = c5.map(it => ({ label: it.name, value: it.code }))
+                this.rawProductGradeList = c6.map(it => ({ label: it.name, value: it.code }))
             } catch (e) {
             } catch (e) {
                 this.specialTermsList = []
                 this.specialTermsList = []
                 this.executionStandardList = []
                 this.executionStandardList = []
                 this.productList = []
                 this.productList = []
                 this.rawToProdRatioList = []
                 this.rawToProdRatioList = []
+                this.rawProductList = []
+                this.rawProductGradeList = []
             }
             }
         },
         },
         displayLabel(field) {
         displayLabel(field) {
@@ -560,7 +568,7 @@ export default {
         async onSubmit() {
         async onSubmit() {
             if (!this.validateRequired()) return
             if (!this.validateRequired()) return
             const confirmRes = await new Promise(resolve => {
             const confirmRes = await new Promise(resolve => {
-                uni.showModal({ title: '提示', content: '确定新增经销未锁规合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
+                uni.showModal({ title: '提示', content: '确定新增加工标准合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
             })
             })
             if (!(confirmRes && confirmRes.confirm)) return
             if (!(confirmRes && confirmRes.confirm)) return
             const clean = (obj) => {
             const clean = (obj) => {
@@ -587,9 +595,6 @@ export default {
                 totalAmountIncludingTax: this.totalAmountIncludingTax,
                 totalAmountIncludingTax: this.totalAmountIncludingTax,
                 contractStdProcessingLineList: lines.map(it => ({
                 contractStdProcessingLineList: lines.map(it => ({
                     ...it,
                     ...it,
-                    productId: it.rawProductId || '',
-                    productName: it.rawProductName || '',
-                    productGrade: it.rawProductGrade || '',
                 }))
                 }))
             })
             })
             console.log('onSubmit__payload', payload)
             console.log('onSubmit__payload', payload)

@@ -28,7 +28,7 @@ statusStyl<template>
                 </view>
                 </view>
 
 
                 <view class="section">
                 <view class="section">
-                    <view class="row"><text class="label">合计人民币金额（大写）</text><text class="value">{{
+                    <view class="row"><text class="label">合计金额（大写）</text><text class="value">{{
                         detail.totalAmountCapital || '-' }}</text></view>
                         detail.totalAmountCapital || '-' }}</text></view>
                     <view class="row"><text class="label">交付定金、数额、时间</text><text class="value">{{ detail.depositInfo ||
                     <view class="row"><text class="label">交付定金、数额、时间</text><text class="value">{{ detail.depositInfo ||
                             '-' }}</text></view>
                             '-' }}</text></view>
@@ -60,7 +60,9 @@ statusStyl<template>
                 </view>
                 </view>
 
 
                 <view class="section">
                 <view class="section">
-                    <view class="row"><text class="label">规范性合同</text><text class="value" style="color: #3D48A3;">{{ detail.standardFileName || '-'
+                    <view class="row"><text class="label">规范性合同</text><text class="value act"
+                            @click="downloadFile(detail.standardFileId, detail.standardFileName)"
+                            >{{ detail.standardFileName || '-'
                             }}</text></view>
                             }}</text></view>
                     <view class="row"><text class="label">合同是否规范</text><text class="value">{{ detail.standardStandardized ? '是' : '否' 
                     <view class="row"><text class="label">合同是否规范</text><text class="value">{{ detail.standardStandardized ? '是' : '否' 
                             }}</text></view>
                             }}</text></view>
@@ -117,6 +119,7 @@ import DetailButtons from '@/components/detail-buttons/index.vue'
 import FileUpload from '@/components/file-upload/index.vue'
 import FileUpload from '@/components/file-upload/index.vue'
 import SingleSelectSheet from '@/components/single-select/index.vue'
 import SingleSelectSheet from '@/components/single-select/index.vue'
 import { fillStandardApprovedName } from '@/utils/dic.js'
 import { fillStandardApprovedName } from '@/utils/dic.js'
+import { downloadFile } from '@/utils/downloadFile.js'
 
 
 export default {
 export default {
     name: 'ContractProcessDetail',
     name: 'ContractProcessDetail',
@@ -219,8 +222,8 @@ export default {
           { ...this.buttons[0], visible: (s === 'DRAFT' && this.$auth.hasPermi('contract-manage:processed-standard-contract:modify')) },
           { ...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[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[2], visible: (s !== 'DELETED' && t !== 'AUDIT' && t !== 'PASS' && this.$auth.hasPermi('contract-manage:processed-standard-contract:upload')) },
+          { ...this.buttons[4], visible: (s === 'STANDARD' && this.$auth.hasPermi('contract-manage:processed-standard-contract:review')) },
           { ...this.buttons[3], visible: (s === 'STANDARD' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:processed-standard-contract:approve')) },
           { ...this.buttons[3], visible: (s === 'STANDARD' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:processed-standard-contract:approve')) },
-          { ...this.buttons[4], visible: (s === 'STANDARD' && this.$auth.hasPermi('contract-manage:processed-standard-contract:review')) }
         ]
         ]
       }
       }
     },
     },
@@ -285,7 +288,7 @@ export default {
                 })
                 })
                 return
                 return
             }
             }
-            if (!this.standardStandardized) {
+            if (!this.standardStandardized && this.standardStandardized !== false) {
                 uni.showToast({
                 uni.showToast({
                     title: '请选择合同是否规范',
                     title: '请选择合同是否规范',
                     icon: 'error'
                     icon: 'error'
@@ -358,6 +361,7 @@ export default {
             uni.setStorageSync(CACHE_KEY, id)
             uni.setStorageSync(CACHE_KEY, id)
             uni.navigateTo({ url: '/pages/flow/audit_detail' })
             uni.navigateTo({ url: '/pages/flow/audit_detail' })
         },
         },
+        downloadFile,
         async loadDetail() {
         async loadDetail() {
             if (!this.id) return
             if (!this.id) return
             try {
             try {
@@ -438,6 +442,10 @@ export default {
     &_已签收 {
     &_已签收 {
       background-image: url('~@/static/images/contract/status_4.png');
       background-image: url('~@/static/images/contract/status_4.png');
     }
     }
+
+    &_已取消 {
+      background-image: url('~@/static/images/contract/status_5.png');
+    }  
   }
   }
 }
 }
 .section1 {
 .section1 {
@@ -456,9 +464,10 @@ export default {
 }
 }
 
 
 .label {
 .label {
-    width: 310rpx;
+    max-width: 310rpx;
     color: rgba(0, 0, 0, 0.6);
     color: rgba(0, 0, 0, 0.6);
     font-size: 28rpx;
     font-size: 28rpx;
+    margin-right: 20rpx;
 }
 }
 
 
 .value {
 .value {
@@ -466,6 +475,11 @@ export default {
     text-align: right;
     text-align: right;
     color: rgba(0, 0, 0, 0.9);
     color: rgba(0, 0, 0, 0.9);
     font-size: 28rpx;
     font-size: 28rpx;
+    white-space: pre-wrap;
+    word-break: break-all;
+    &.act {
+      color: $theme-primary;
+    }
 }
 }
 
 
 .customer {
 .customer {
@@ -516,4 +530,7 @@ export default {
     color: rgba(0, 0, 0, 0.6);
     color: rgba(0, 0, 0, 0.6);
     font-size: 32rpx;
     font-size: 32rpx;
 }
 }
+.upload-row {
+    margin-top: 20rpx;
+}
 </style>
 </style>

@@ -49,7 +49,7 @@
           <view class="card" @click="goDetail(item)">
           <view class="card" @click="goDetail(item)">
             <view class="card-header">
             <view class="card-header">
               <text class="title omit2">{{ item.buyerName }}</text>
               <text class="title omit2">{{ item.buyerName }}</text>
-              <text v-if="item.status === 'STANDARD'" :class="['status']" :style="{ background: statusMap[item.shippingStatusName] }">{{ item.shippingStatusName }}</text>
+              <text v-if="item.status === 'STANDARD'" :class="['status', 'status_' + item.shippingStatusName]">{{ item.shippingStatusName }}</text>
             </view>
             </view>
             <view class="info-row">
             <view class="info-row">
               <text>编号</text><text>{{ item.code }}</text>
               <text>编号</text><text>{{ item.code }}</text>
@@ -94,8 +94,7 @@
 <script>
 <script>
 import CardList from '@/components/card/index.vue'
 import CardList from '@/components/card/index.vue'
 import FilterModal from '@/components/filter/index.vue'
 import FilterModal from '@/components/filter/index.vue'
-import { queryContractApi, statusStyle,statusMap } from '@/api/contract.js'
-import { officeQueryApi } from '@/api/devManage.js'
+import { queryContractApi, statusStyle } from '@/api/contract.js'
 
 
 export default {
 export default {
   components: { CardList, FilterModal },
   components: { CardList, FilterModal },
@@ -116,7 +115,6 @@ export default {
       filterForm: { deptId: '', deptName: '', dateRange: [] },
       filterForm: { deptId: '', deptName: '', dateRange: [] },
       deptSelectVisible: false,
       deptSelectVisible: false,
       statusStyle,
       statusStyle,
-      statusMap,
     }
     }
   },
   },
   computed: {
   computed: {
@@ -329,26 +327,30 @@ export default {
             font-size: 30rpx;
             font-size: 30rpx;
             font-weight: 600;
             font-weight: 600;
             position: absolute;
             position: absolute;
-            top: -36rpx;
-            right: -32rpx;
+            top: -32rpx;
+            right: -12rpx;
             height: 48rpx;
             height: 48rpx;
-            line-height: 48rpx;
+            line-height: 50rpx;
             color: #fff;
             color: #fff;
             font-size: 24rpx;
             font-size: 24rpx;
             padding: 0 14rpx;
             padding: 0 14rpx;
             border-radius: 6rpx;
             border-radius: 6rpx;
-            &.status_1 {
+            &_审批中 {
                 background: $theme-primary;
                 background: $theme-primary;
             }
             }
-            &.status_2 {
+            &_生产中 {
                 background: #2BA471;
                 background: #2BA471;
             }
             }
-            &.status_3 {
-                background: #D54941;
+            &_已发货 {
+                background: #E37318;
             }
             }
-            &.status_4 {
-                background: #E7E7E7;
-                color: rgba(0,0,0,0.9);
+            &_已签收 {
+                background: #858A99;
+                color: #ffffff;
+            }
+            &_已取消 {
+                background: #9E9E9E;
+                color: #ffffff;
             }
             }
         }
         }
     }
     }
@@ -379,19 +381,19 @@ export default {
     }
     }
 }
 }
 
 
-.filter-form { 
+.filter-form {
     .form-item { margin-bottom: 24rpx; }
     .form-item { margin-bottom: 24rpx; }
-    .label { 
-        margin-bottom: 20rpx; 
+    .label {
+        margin-bottom: 20rpx;
         color: rgba(0,0,0,0.9);
         color: rgba(0,0,0,0.9);
         height: 44rpx;
         height: 44rpx;
         line-height: 44rpx;
         line-height: 44rpx;
         font-size: 30rpx;
         font-size: 30rpx;
      }
      }
-    .fake-select { 
-        height: 80rpx; line-height: 80rpx; padding: 0 20rpx; background: #f3f3f3; border-radius: 12rpx; 
+    .fake-select {
+        height: 80rpx; line-height: 80rpx; padding: 0 20rpx; background: #f3f3f3; border-radius: 12rpx;
         .placeholder { color: #999; }
         .placeholder { color: #999; }
         .value { color: #333; }
         .value { color: #333; }
     }
     }
 }
 }
-</style>
+</style>

@@ -41,11 +41,11 @@
                     </template>
                     </template>
                 </uni-list-item>
                 </uni-list-item>
 
 
-                <ProductRel mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" :list="productLineList" @change="onProductsChange" :options="productList" />
+                <ProductRel mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" :rawToProdRatioList="rawToProdRatioList" :list="productLineList" @change="onProductsChange" :options="productList"  :rawProductList="rawProductList" :rawProductGradeList="rawProductGradeList" />
 
 
-                <uni-list-item title="合计人民币金额（大写）">
+                <uni-list-item title="合计金额（大写）">
                     <template v-slot:footer>
                     <template v-slot:footer>
-                        <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false"
+                        <uni-easyinput v-model="form.totalAmountCapital" placeholder="" :inputBorder="false"
                             disabled />
                             disabled />
                     </template>
                     </template>
                 </uni-list-item>
                 </uni-list-item>
@@ -266,6 +266,8 @@ export default {
             productList: [],
             productList: [],
             regionOptions: [],
             regionOptions: [],
             rawToProdRatioList: [],
             rawToProdRatioList: [],
+            rawProductList: [],
+            rawProductGradeList: [],
         }
         }
     },
     },
     onLoad(query) {
     onLoad(query) {
@@ -383,20 +385,27 @@ export default {
         },
         },
         async loadExtraOptions() {
         async loadExtraOptions() {
             try {
             try {
-                const results = await getDicByCodes(['CONDITIONS_REQUIRED', 'APPLICABLE_STANDARD', 'CONTRACT_PRODUCT','RAW_TO_PROD_RATIO'])
+                const results = await getDicByCodes(['CONDITIONS_REQUIRED', 'APPLICABLE_STANDARD', 'CONTRACT_PRODUCT','RAW_TO_PROD_RATIO', 'RAW_MATERIAL', 'RAW_MATERIAL_GRADE'])
                 const c1 = results && results.CONDITIONS_REQUIRED && results.CONDITIONS_REQUIRED.data ? results.CONDITIONS_REQUIRED.data : []
                 const c1 = results && results.CONDITIONS_REQUIRED && results.CONDITIONS_REQUIRED.data ? results.CONDITIONS_REQUIRED.data : []
                 const c2 = results && results.APPLICABLE_STANDARD && results.APPLICABLE_STANDARD.data ? results.APPLICABLE_STANDARD.data : []
                 const c2 = results && results.APPLICABLE_STANDARD && results.APPLICABLE_STANDARD.data ? results.APPLICABLE_STANDARD.data : []
                 const c3 = results && results.CONTRACT_PRODUCT && results.CONTRACT_PRODUCT.data ? results.CONTRACT_PRODUCT.data : []
                 const c3 = results && results.CONTRACT_PRODUCT && results.CONTRACT_PRODUCT.data ? results.CONTRACT_PRODUCT.data : []
                 const c4 = results && results.RAW_TO_PROD_RATIO && results.RAW_TO_PROD_RATIO.data ? results.RAW_TO_PROD_RATIO.data : []
                 const c4 = results && results.RAW_TO_PROD_RATIO && results.RAW_TO_PROD_RATIO.data ? results.RAW_TO_PROD_RATIO.data : []
+                 const c5 = results && results.RAW_MATERIAL && results.RAW_MATERIAL.data ? results.RAW_MATERIAL.data : []
+                const c6 = results && results.RAW_MATERIAL_GRADE && results.RAW_MATERIAL_GRADE.data ? results.RAW_MATERIAL_GRADE.data : []
                 this.rawToProdRatioList = c4.map(it => ({ label: it.name, value: it.code }))
                 this.rawToProdRatioList = c4.map(it => ({ label: it.name, value: it.code }))
                 this.specialTermsList = c1.map(it => ({ label: it.name, value: it.code }))
                 this.specialTermsList = c1.map(it => ({ label: it.name, value: it.code }))
                 this.executionStandardList = c2.map(it => ({ label: it.name, value: it.code }))
                 this.executionStandardList = c2.map(it => ({ label: it.name, value: it.code }))
                 this.productList = c3.map(it => ({ label: it.name, value: it.code }))
                 this.productList = c3.map(it => ({ label: it.name, value: it.code }))
+                console.log('c5', c5)
+                this.rawProductList = c5.map(it => ({ label: it.name, value: it.code }))
+                this.rawProductGradeList = c6.map(it => ({ label: it.name, value: it.code }))
             } catch (e) {
             } catch (e) {
                 this.specialTermsList = []
                 this.specialTermsList = []
                 this.executionStandardList = []
                 this.executionStandardList = []
                 this.productList = []
                 this.productList = []
                 this.rawToProdRatioList = []
                 this.rawToProdRatioList = []
+                this.rawProductList = []
+                this.rawProductGradeList = []
             }
             }
         },
         },
         displayLabel(field) {
         displayLabel(field) {
@@ -486,12 +495,12 @@ export default {
             }
             }
             const strEmpty = (v) => (v === undefined || v === null || (typeof v === 'string' && v.trim() === ''))
             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)))
             const numEmpty = (v) => (v === undefined || v === null || v === '' || (typeof v === 'number' && isNaN(v)))
+            console.log('list11', list)
             for (const [idx, it] of list.entries()) {
             for (const [idx, it] of list.entries()) {
                 if (
                 if (
                     strEmpty(it.productName) ||
                     strEmpty(it.productName) ||
                     strEmpty(it.industry) ||
                     strEmpty(it.industry) ||
                     strEmpty(it.quality) ||
                     strEmpty(it.quality) ||
-                    strEmpty(it.brand) ||
                     numEmpty(it.productQuantity) ||
                     numEmpty(it.productQuantity) ||
                     strEmpty(it.unitPrice) ||
                     strEmpty(it.unitPrice) ||
                     strEmpty(it.deliveryDate)
                     strEmpty(it.deliveryDate)
@@ -505,7 +514,7 @@ export default {
             console.log('onSubmit__payload', payload)
             console.log('onSubmit__payload', payload)
             if (!this.validateRequired()) return
             if (!this.validateRequired()) return
             const confirmRes = await new Promise(resolve => {
             const confirmRes = await new Promise(resolve => {
-                uni.showModal({ title: '提示', content: '确定保存当前经销未锁规合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
+                uni.showModal({ title: '提示', content: '确定保存当前加工标准合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
             })
             })
             if (!(confirmRes && confirmRes.confirm)) return
             if (!(confirmRes && confirmRes.confirm)) return
             const clean = (obj) => {
             const clean = (obj) => {

@@ -19,7 +19,7 @@
             </view>
             </view>
 
 
             <view class="section">
             <view class="section">
-                <view class="row"><text class="label">合计人民币金额（大写）</text><text class="value">{{
+                <view class="row"><text class="label">合计金额（大写）</text><text class="value">{{
                     detail.totalAmountCapital || '-' }}</text></view>
                     detail.totalAmountCapital || '-' }}</text></view>
                 <view class="row"><text class="label">交付定金、数额、时间</text><text class="value">{{ detail.depositInfo ||
                 <view class="row"><text class="label">交付定金、数额、时间</text><text class="value">{{ detail.depositInfo ||
                     '-' }}</text></view>
                     '-' }}</text></view>

@@ -21,9 +21,9 @@
                             <view class="item-title"><text>原材料名称</text></view>
                             <view class="item-title"><text>原材料名称</text></view>
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
-                    <uni-list-item title="原材料牌号">
-                        <template v-slot:footer>
-                            <uni-easyinput v-model="item.rawProductGrade" :inputBorder="false" placeholder="请输入原材料牌号" />
+                    <uni-list-item class="select-item" :class="item.rawProductGradeName ? 'is-filled' : 'is-empty'" clickable @click="openProductGradeSheet(idx)" :rightText="item.rawProductGradeName || '请选择原材料牌号'" showArrow>
+                        <template v-slot:body>
+                            <view class="item-title"><text>原材料牌号</text></view>
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="行业">
                     <uni-list-item title="行业">
@@ -38,9 +38,9 @@
                             <view class="item-title"><text>原材料名称</text></view>
                             <view class="item-title"><text>原材料名称</text></view>
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
-                    <uni-list-item title="原材料牌号">  
-                        <template v-slot:footer>
-                            <uni-easyinput v-model="item.rawProductGrade" :inputBorder="false" placeholder="请输入原材料牌号" />
+                    <uni-list-item class="select-item" :class="item.rawProductGradeName ? 'is-filled' : 'is-empty'" clickable @click="openProductGradeSheet(idx)" :rightText="item.rawProductGradeName || '请选择原材料牌号'" showArrow>
+                        <template v-slot:body>
+                            <view class="item-title"><text>原材料牌号</text></view>
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="行业">
                     <uni-list-item title="行业">
@@ -58,14 +58,14 @@
                             <uni-easyinput v-model="item.supplyTime" :inputBorder="false" placeholder="请输入原材料提供时间" />
                             <uni-easyinput v-model="item.supplyTime" :inputBorder="false" placeholder="请输入原材料提供时间" />
                         </template>
                         </template>
                     </uni-list-item>
                     </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.materialProductRatioName ? 'is-filled' : 'is-empty'" clickable @click="openRawToProdRatioSheet(idx)" :rightText="item.materialProductRatioName || '请选择原材料与产品数量比'" showArrow>
                         <template v-slot:body>
                         <template v-slot:body>
                             <view class="item-title"><text>原材料与产品数量比</text></view>
                             <view class="item-title"><text>原材料与产品数量比</text></view>
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
-                    <uni-list-item title="原材料与产品数量比备注">
+                    <uni-list-item title="原材料与产品数量比备注" v-if="item.materialProductRatio === '10'">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.materialProductRatioRemarks" :disabled="item.materialProductRatio !== '10'" :inputBorder="false" placeholder="请输入原材料与产品数量比备注" />
+                            <uni-easyinput v-model="item.materialProductRatioRemarks" :inputBorder="false" placeholder="请输入原材料与产品数量比备注" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
 
 
@@ -92,13 +92,13 @@
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="厚度公差上限(mm)">
                     <uni-list-item title="厚度公差上限(mm)">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput type="text" v-model="item.thicknessTolPos" :inputBorder="false"
+                            <uni-easyinput type="digit" v-model="item.thicknessTolPos" :inputBorder="false"
                                 placeholder="请输入厚度公差上限" @input="onNumberInput(idx, 'thicknessTolPos')" @blur="onNumberBlur(idx, 'thicknessTolPos', 9)" />
                                 placeholder="请输入厚度公差上限" @input="onNumberInput(idx, 'thicknessTolPos')" @blur="onNumberBlur(idx, 'thicknessTolPos', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="厚度公差下限(mm)">
                     <uni-list-item title="厚度公差下限(mm)">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput type="text" v-model="item.thicknessTolNeg" :inputBorder="false"
+                            <uni-easyinput type="digit" v-model="item.thicknessTolNeg" :inputBorder="false"
                                 placeholder="请输入厚度公差下限" @input="onNumberInput(idx, 'thicknessTolNeg')" @blur="onNumberBlur(idx, 'thicknessTolNeg', 9)" />
                                 placeholder="请输入厚度公差下限" @input="onNumberInput(idx, 'thicknessTolNeg')" @blur="onNumberBlur(idx, 'thicknessTolNeg', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
@@ -109,12 +109,12 @@
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="宽度公差上限(mm)">
                     <uni-list-item title="宽度公差上限(mm)">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput type="text" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差上限" @input="onNumberInput(idx, 'widthTolPos')" @blur="onNumberBlur(idx, 'widthTolPos', 9)" />
+                            <uni-easyinput type="digit" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差上限" @input="onNumberInput(idx, 'widthTolPos')" @blur="onNumberBlur(idx, 'widthTolPos', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="宽度公差下限(mm)">
                     <uni-list-item title="宽度公差下限(mm)">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput type="text" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差下限" @input="onNumberInput(idx, 'widthTolNeg')" @blur="onNumberBlur(idx, 'widthTolNeg', 9)" />
+                            <uni-easyinput type="digit" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差下限" @input="onNumberInput(idx, 'widthTolNeg')" @blur="onNumberBlur(idx, 'widthTolNeg', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="长度(mm)">
                     <uni-list-item title="长度(mm)">
@@ -124,19 +124,19 @@
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="长度公差上限(mm)">
                     <uni-list-item title="长度公差上限(mm)">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput type="text" v-model="item.lengthTolPos" :inputBorder="false"
+                            <uni-easyinput type="digit" v-model="item.lengthTolPos" :inputBorder="false"
                                 placeholder="请输入长度公差上限" @input="onNumberInput(idx, 'lengthTolPos')" @blur="onNumberBlur(idx, 'lengthTolPos', 9)" />
                                 placeholder="请输入长度公差上限" @input="onNumberInput(idx, 'lengthTolPos')" @blur="onNumberBlur(idx, 'lengthTolPos', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="长度公差下限(mm)">
                     <uni-list-item title="长度公差下限(mm)">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput type="text" v-model="item.lengthTolNeg" :inputBorder="false"
+                            <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false"
                                 placeholder="请输入长度公差下限" @input="onNumberInput(idx, 'lengthTolNeg')" @blur="onNumberBlur(idx, 'lengthTolNeg', 9)" />
                                 placeholder="请输入长度公差下限" @input="onNumberInput(idx, 'lengthTolNeg')" @blur="onNumberBlur(idx, 'lengthTolNeg', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="定作物数量">
                     <uni-list-item title="定作物数量">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.productQuantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'productQuantity')" @blur="onNonNegativeBlur(idx, 'productQuantity', 9)" />
+                            <uni-easyinput v-model="item.productQuantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'productQuantity')" @blur="onNonNegativeBlur(idx, 'productQuantity', 2)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="加工费单价">
                     <uni-list-item title="加工费单价">
@@ -146,12 +146,12 @@
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="不含税金额">
                     <uni-list-item title="不含税金额">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.amountExcludingTax" type="number" :inputBorder="false" disabled placeholder="自动计算" />
+                            <uni-easyinput v-model="item.amountExcludingTax" type="number" :inputBorder="false" disabled placeholder="" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="总金额">
                     <uni-list-item title="总金额">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.totalAmount" type="number" :inputBorder="false" disabled placeholder="自动计算" />
+                            <uni-easyinput v-model="item.totalAmount" type="number" :inputBorder="false" disabled placeholder="" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="发货日期">
                     <uni-list-item title="发货日期">
@@ -175,35 +175,39 @@
         <view v-else class="view-list" v-show="!collapsedView">
         <view v-else class="view-list" v-show="!collapsedView">
             <view v-for="(item, idx) in items" :key="'v-' + idx" class="card">
             <view v-for="(item, idx) in items" :key="'v-' + idx" class="card">
                 <view class="row"><text class="label">原材料名称</text><text class="value">{{ item.rawProductName }}</text></view>
                 <view class="row"><text class="label">原材料名称</text><text class="value">{{ item.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.rawProductGradeName }}</text></view>
+                <view class="row"><text class="label">原材料提供时间</text><text class="value">{{ item.supplyTime }}</text></view>
+                <view class="row"><text class="label">原材料产品数量比</text><text class="value">{{ item.materialProductRatioName }}</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.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.quality }}</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 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 > 0 ? '+' + item.thicknessTolPos : item.thicknessTolPos }}
+                            </view>
+                            <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg > 0 ? '+' + item.thicknessTolNeg : item.thicknessTolNeg }}
                             </view>
                             </view>
-                            <view v-if="item.width" class="value-spec_val p12">*</view>
-                            <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
-                            <view v-if="item.width" class="value-spec_box">
-                                <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view>
-                                <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg }}</view>
+                        </view>
+                        <view v-if="item.width" class="value-spec_val p12">*</view>
+                        <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
+                        <view v-if="item.width" class="value-spec_box">
+                            <view v-if="item.widthTolPos" class="value-spec_box_1">{{ item.widthTolPos > 0 ? '+' + item.widthTolPos : item.widthTolPos }}
                             </view>
                             </view>
-                            <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 v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg > 0 ? '+' + item.widthTolNeg : item.widthTolNeg }}
+                            </view>
+                        </view>
+                        <view v-if="item.length" class="value-spec_val p12">*</view>
+                        <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
+                        <view v-if="item.length" class="value-spec_box">
+                            <view v-if="item.lengthTolPos" class="value-spec_box_1">{{ item.lengthTolPos > 0 ? '+' + item.lengthTolPos : item.lengthTolPos }}
+                            </view>
+                            <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg > 0 ? '+' + item.lengthTolNeg : item.lengthTolNeg }}
                             </view>
                             </view>
                         </view>
                         </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">{{ item.productQuantity }}</text></view>
                 <view class="row"><text class="label">加工费单价</text><text class="value">{{ formatCurrency(item.unitPrice)
                 <view class="row"><text class="label">加工费单价</text><text class="value">{{ formatCurrency(item.unitPrice)
                         }}</text>
                         }}</text>
@@ -230,7 +234,9 @@ export default {
         deliveryDateBase: { type: String, default: '' },
         deliveryDateBase: { type: String, default: '' },
         options: { type: Array, default: () => [] },
         options: { type: Array, default: () => [] },
         deliveryDate: { type: String, default: '' },
         deliveryDate: { type: String, default: '' },
-        rawToProdRatioList: { type: Array, default: () => [] }
+        rawToProdRatioList: { type: Array, default: () => [] },
+        rawProductList: { type: Array, default: () => [] },
+        rawProductGradeList: { type: Array, default: () => [] },
     },
     },
     components: { SingleSelectSheet },
     components: { SingleSelectSheet },
   data() {
   data() {
@@ -250,11 +256,18 @@ export default {
     },
     },
     ratioOptions() {
     ratioOptions() {
       const list = Array.isArray(this.rawToProdRatioList) ? this.rawToProdRatioList : []
       const list = Array.isArray(this.rawToProdRatioList) ? this.rawToProdRatioList : []
+      console.log('list', list)
       return list.map(o => ({
       return list.map(o => ({
         label: o.label != null ? o.label : (o.text != null ? o.text : (o.name != null ? o.name : '')),
         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)
         value: o.value != null ? o.value : (o.id != null ? o.id : o.code)
       }))
       }))
     },
     },
+    rawProductOptions() {
+      return Array.isArray(this.rawProductList) ? this.rawProductList : []
+    },
+    rawProductGradeOptions() {
+      return Array.isArray(this.rawProductGradeList) ? this.rawProductGradeList : []
+    },
     minDeliveryDate() {
     minDeliveryDate() {
       const s = this.deliveryDate
       const s = this.deliveryDate
       if (!s) return ''
       if (!s) return ''
@@ -263,12 +276,10 @@ export default {
       const m = Number(parts[1])
       const m = Number(parts[1])
       const d = Number(parts[2])
       const d = Number(parts[2])
       if (!y || !m || !d) return ''
       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}`
+      const yy = y
+      const mm = String(m).padStart(2, '0')
+      const dd = String(d).padStart(2, '0')
+      return `${yy}-${mm}-${dd}`
     }
     }
   },
   },
   watch: {
   watch: {
@@ -278,8 +289,6 @@ export default {
     },
     },
     list: {
     list: {
       handler(v) {
       handler(v) {
-        // const arr = Array.isArray(v) ? v : []
-        // this.items = arr.map(x => ({ ...this.defaultItem(), ...x, collapsed: true }))
         this.items = v.map(x => ({ ...this.defaultItem(), ...x, collapsed: true }))
         this.items = v.map(x => ({ ...this.defaultItem(), ...x, collapsed: true }))
         console.log('v', v)
         console.log('v', v)
       },
       },
@@ -289,11 +298,12 @@ export default {
   created() {
   created() {
     const init = Array.isArray(this.list) && this.list.length > 0 ? this.list.map(v => ({ ...this.defaultItem(), ...v, collapsed: true })) : [{ ...this.defaultItem(), collapsed: false }]
     const init = Array.isArray(this.list) && this.list.length > 0 ? this.list.map(v => ({ ...this.defaultItem(), ...v, collapsed: true })) : [{ ...this.defaultItem(), collapsed: false }]
     this.items = init
     this.items = init
+    console.log('init', init)
     this.recalculateAll()
     this.recalculateAll()
   },
   },
   methods: {
   methods: {
         defaultItem() {
         defaultItem() {
-            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: '' }
+            return { productId:'', productName:'', productGrade:'', productStatus:'', rawProductId: '', rawProductName: '', rawProductGrade: '', industry: '',materialProductRatioRemarks:'', supplyTime: '存料加工', materialProductRatio: '', materialProductRatioName: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '',  productQuantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '' }
         },
         },
         onNumberInput(idx, field) {
         onNumberInput(idx, field) {
             const it = this.items[idx]
             const it = this.items[idx]
@@ -405,11 +415,25 @@ export default {
           return [t, w, l].filter(Boolean).join(' × ')
           return [t, w, l].filter(Boolean).join(' × ')
         },
         },
         openProductSheet(idx) {
         openProductSheet(idx) {
-            const opts = this.selectOptions
+            const opts = this.rawProductOptions
             const current = this.items[idx] && this.items[idx].rawProductId
             const current = this.items[idx] && this.items[idx].rawProductId
             const match = opts.find(o => String(o.value) === String(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 : '', mode: 'product' }
             this.sheet = { ...this.sheet, visible: true, title: '请选择原材料名称', options: opts, idx, value: match ? match.value : '', mode: 'product' }
         },
         },
+        openProductGradeSheet(idx) {
+            const it = this.items[idx]
+            if (!it || !it.rawProductId) {
+                uni.showToast({ title: '请先选择原材料名称', icon: 'none' })
+                return
+            }
+            const opts = this.rawProductGradeOptions.filter(o => {
+                const code = o.value
+                return code && it.rawProductId && String(code).startsWith(String(it.rawProductId))
+            })
+            const current = it.rawProductGrade
+            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: 'grade' }
+        },
         openProductTargetSheet(idx) {
         openProductTargetSheet(idx) {
             const opts = this.selectOptions
             const opts = this.selectOptions
             const current = this.items[idx] && this.items[idx].productId
             const current = this.items[idx] && this.items[idx].productId
@@ -428,10 +452,17 @@ export default {
             if (!it) { this.sheet.visible = false; return }
             if (!it) { this.sheet.visible = false; return }
             if (this.sheet.mode === 'ratio') {
             if (this.sheet.mode === 'ratio') {
                 it.materialProductRatio = value
                 it.materialProductRatio = value
-                it.rawToProdRatioName = label || ''
+                it.materialProductRatioName = label || ''
             } else if (this.sheet.mode === 'product') {
             } else if (this.sheet.mode === 'product') {
+                if (it.rawProductId !== value) {
+                    it.rawProductGrade = ''
+                    it.rawProductGradeName = ''
+                }
                 it.rawProductId = value
                 it.rawProductId = value
                 it.rawProductName = label || ''
                 it.rawProductName = label || ''
+            } else if (this.sheet.mode === 'grade') {
+                it.rawProductGrade = value
+                it.rawProductGradeName = label || ''
             } else if (this.sheet.mode === 'target') {
             } else if (this.sheet.mode === 'target') {
                 it.productId = value
                 it.productId = value
                 it.productName = label || ''
                 it.productName = label || ''

@@ -60,7 +60,7 @@
                 <ProductRel ref="productRel" mode="add" :deliveryDateBase="form.deliveryDate"  :deliveryDate="form.orderDate" @change="onProductsChange" :options="productList" />
                 <ProductRel ref="productRel" mode="add" :deliveryDateBase="form.deliveryDate"  :deliveryDate="form.orderDate" @change="onProductsChange" :options="productList" />
                 <uni-list-item title="合计人民币金额（大写）">
                 <uni-list-item title="合计人民币金额（大写）">
                     <template v-slot:footer>
                     <template v-slot:footer>
-                        <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false" disabled />
+                        <uni-easyinput v-model="form.totalAmountCapital" placeholder="" :inputBorder="false" disabled />
                     </template>
                     </template>
                 </uni-list-item>
                 </uni-list-item>
                 <uni-list-item title="交付定金、数额、时间">
                 <uni-list-item title="交付定金、数额、时间">