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

@@ -81,12 +81,6 @@
       <Host>localhost</Host>
       <Host>localhost</Host>
       <Port>5050</Port>
       <Port>5050</Port>
     </configuration>
     </configuration>
-    <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
-      <module name="" />
-      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
-      <option name="PROGRAM_PARAMETERS" />
-      <method />
-    </configuration>
     <configuration default="true" type="Application" factoryName="Application">
     <configuration default="true" type="Application" factoryName="Application">
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
       <method v="2">
       <method v="2">
@@ -115,6 +109,15 @@
         <option name="Make" enabled="true" />
         <option name="Make" enabled="true" />
       </method>
       </method>
     </configuration>
     </configuration>
+    <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType">
+      <module name="" />
+      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
+      <option name="PROGRAM_PARAMETERS" />
+      <predefined_log_file enabled="true" id="idea.log" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
   </component>
   </component>
   <component name="SharedIndexes">
   <component name="SharedIndexes">
     <attachedChunks>
     <attachedChunks>
@@ -156,7 +159,15 @@
   <component name="TypeScriptGeneratedFilesManager">
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="3" />
     <option name="version" value="3" />
   </component>
   </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
   </component>
   </component>
 </project>
 </project>

@@ -5,7 +5,7 @@ import { getToken } from '@/utils/auth'
 
 
 
 
 /**
 /**
- * 根据编号获取数据字段
+ * 根据字典编号获取数据字段
  * @param code
  * @param code
  */
  */
 export function getDicByCodeApi(code) {
 export function getDicByCodeApi(code) {
@@ -41,11 +41,26 @@ export function selectorCityApi() {
   })
   })
 }
 }
 /**
 /**
- * 回去城市接口 省市区 一次性返回
+ * 获取菜单
  */
  */
 export function getMenusApi() {
 export function getMenusApi() {
   return request({
   return request({
     url: `/auth/menus`,
     url: `/auth/menus`,
     method: 'get'
     method: 'get'
   })
   })
+}
+
+/**
+ * 生成编号
+ * @param type
+ * 客户池编号 5
+ */
+export function generateCodeApi(type) {
+  return request({
+    url: `/component/generate/code`,
+    method: 'get',
+    params: {
+      type
+    },
+  })
 }
 }

@@ -20,6 +20,15 @@ export const statusMap = {
 }
 }
 
 
 const baseUrl = '/contract';
 const baseUrl = '/contract';
+// 查询当前人所在办事处
+export function getDeptApi(params) {
+  return request({
+    url: `/system/dept/getDept`,
+    method: 'get',
+    params
+  })
+}
+
 // 查询合同框架列表
 // 查询合同框架列表
 export function queryApi(params) {
 export function queryApi(params) {
   return request({
   return request({

+import request from '@/utils/request'
+import { ContentTypeEnum } from '@/utils/httpEnum';
+
+const baseUrl = '/basedata/customer';
+// 查询列表
+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
+  })
+}
+
+// 停用
+export function unableApi(id) {
+  return request({
+    url: baseUrl + '/unable',
+    method: 'patch',
+    data: {
+      id
+    },
+    contentType: ContentTypeEnum.FORM_URLENCODED
+  })
+}
+
+// 启用
+export function enableApi(id) {
+  return request({
+    url: baseUrl + '/enable',
+    method: 'patch',
+    data: {
+      id
+    },
+    contentType: ContentTypeEnum.FORM_URLENCODED
+  })
+}

@@ -139,7 +139,7 @@ export default {
           })
           })
         } else if (this.source === 'user') {
         } else if (this.source === 'user') {
           // 人员表
           // 人员表
-          const params = { pageIndex, pageSize, name, username: name }
+          const params = { pageIndex, pageSize, name }
           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 || []

@@ -106,6 +106,38 @@
 			}
 			}
 		},
 		},
 		{
 		{
+			"path": "pages/customer/index",
+			"style": {
+				"navigationBarTitleText": "客户信息",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/customer/add",
+			"style": {
+				"navigationBarTitleText": "新增客户信息",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/customer/detail",
+			"style": {
+				"navigationBarTitleText": "客户信息详情",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/customer/modify",
+			"style": {
+				"navigationBarTitleText": "编辑客户信息",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
 			"path": "pages/credit_manage/index",
 			"path": "pages/credit_manage/index",
 			"style": {
 			"style": {
 				"navigationBarTitleText": "客户资信管理",
 				"navigationBarTitleText": "客户资信管理",
@@ -616,6 +648,14 @@
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 				"navigationBarTextStyle": "black"
 			}
 			}
+		},
+		{
+			"path": "pages/message/detail",
+			"style": {
+				"navigationBarTitleText": "消息详情",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
 		}
 		}
 	],
 	],
 	"subPackages": [
 	"subPackages": [

@@ -82,7 +82,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="form.changeDescription" placeholder="请输入变更说明" :inputBorder="false" />
+              <uni-easyinput type="textarea" v-model="form.changeDescription" placeholder="请输入变更说明" :inputBorder="false" />
             </template>
             </template>
           </uni-list-item>
           </uni-list-item>
         </view>
         </view>
@@ -344,6 +344,31 @@ export default {
             return false
             return false
           }
           }
         }
         }
+        const has = (v) => v !== undefined && v !== null && String(v).trim() !== ''
+        if (has(it.thicknessTolPos) && has(it.thicknessTolNeg)) {
+          const pos = Number(it.thicknessTolPos)
+          const neg = Number(it.thicknessTolNeg)
+          if (!(pos > neg)) {
+            uni.showToast({ title: `产品第${i + 1}条：厚度公差上限需大于下限`, icon: 'none' })
+            return false
+          }
+        }
+        if (has(it.widthTolPos) && has(it.widthTolNeg)) {
+          const pos = Number(it.widthTolPos)
+          const neg = Number(it.widthTolNeg)
+          if (!(pos > neg)) {
+            uni.showToast({ title: `产品第${i + 1}条：宽度公差上限需大于下限`, icon: 'none' })
+            return false
+          }
+        }
+        if (has(it.lengthTolPos) && has(it.lengthTolNeg)) {
+          const pos = Number(it.lengthTolPos)
+          const neg = Number(it.lengthTolNeg)
+          if (!(pos > neg)) {
+            uni.showToast({ title: `产品第${i + 1}条：长度公差上限需大于下限`, icon: 'none' })
+            return false
+          }
+        }
       }
       }
       return true
       return true
     },
     },

@@ -81,7 +81,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="form.changeDescription" placeholder="请输入变更说明" :inputBorder="false" />  
+              <uni-easyinput type="textarea" v-model="form.changeDescription" placeholder="请输入变更说明" :inputBorder="false" />
             </template>
             </template>
           </uni-list-item>
           </uni-list-item>
         </view>
         </view>
@@ -264,6 +264,31 @@ export default {
             return false
             return false
           }
           }
         }
         }
+        const has = (v) => v !== undefined && v !== null && String(v).trim() !== ''
+        if (has(it.thicknessTolPos) && has(it.thicknessTolNeg)) {
+          const pos = Number(it.thicknessTolPos)
+          const neg = Number(it.thicknessTolNeg)
+          if (!(pos > neg)) {
+            uni.showToast({ title: `产品第${i + 1}条：厚度公差上限需大于下限`, icon: 'none' })
+            return false
+          }
+        }
+        if (has(it.widthTolPos) && has(it.widthTolNeg)) {
+          const pos = Number(it.widthTolPos)
+          const neg = Number(it.widthTolNeg)
+          if (!(pos > neg)) {
+            uni.showToast({ title: `产品第${i + 1}条：宽度公差上限需大于下限`, icon: 'none' })
+            return false
+          }
+        }
+        if (has(it.lengthTolPos) && has(it.lengthTolNeg)) {
+          const pos = Number(it.lengthTolPos)
+          const neg = Number(it.lengthTolNeg)
+          if (!(pos > neg)) {
+            uni.showToast({ title: `产品第${i + 1}条：长度公差上限需大于下限`, icon: 'none' })
+            return false
+          }
+        }
       }
       }
       return true
       return true
     },
     },

@@ -42,20 +42,20 @@
                                     @blur="onNonNegativeNumberBlur(item, idx, 'thickness')" />
                                     @blur="onNonNegativeNumberBlur(item, idx, 'thickness')" />
                             </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.thicknessTolPos" placeholder="请输入厚度公差 +"
+                                <uni-easyinput type="number" v-model="item.thicknessTolPos" placeholder="请输入厚度公差上限"
                                     :inputBorder="false"
                                     :inputBorder="false"
-                                    @input="onNonNegativeNumberInput($event, item, idx, 'thicknessTolPos')"
-                                    @blur="onNonNegativeNumberBlur(item, idx, 'thicknessTolPos')" />
+                                    @input="onRealNumberInput($event, item, idx, 'thicknessTolPos')"
+                                    @blur="onRealNumberBlur(item, idx, 'thicknessTolPos')" />
                             </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" placeholder="请输入厚度公差 -"
+                                <uni-easyinput type="number" v-model="item.thicknessTolNeg" placeholder="请输入厚度公差下限"
                                     :inputBorder="false"
                                     :inputBorder="false"
-                                    @input="onNonNegativeNumberInput($event, item, idx, 'thicknessTolNeg')"
-                                    @blur="onNonNegativeNumberBlur(item, idx, 'thicknessTolNeg')" />
+                                    @input="onRealNumberInput($event, item, idx, 'thicknessTolNeg')"
+                                    @blur="onRealNumberBlur(item, idx, 'thicknessTolNeg')" />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="宽度(mm)">
                         <uni-list-item title="宽度(mm)">
@@ -65,20 +65,20 @@
                                     @blur="onNonNegativeNumberBlur(item, idx, 'width')" />
                                     @blur="onNonNegativeNumberBlur(item, idx, 'width')" />
                             </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.widthTolPos" placeholder="请输入宽度公差 +"
+                                <uni-easyinput type="number" v-model="item.widthTolPos" placeholder="请输入宽度公差上限"
                                     :inputBorder="false"
                                     :inputBorder="false"
-                                    @input="onNonNegativeNumberInput($event, item, idx, 'widthTolPos')"
-                                    @blur="onNonNegativeNumberBlur(item, idx, 'widthTolPos')" />
+                                    @input="onRealNumberInput($event, item, idx, 'widthTolPos')"
+                                    @blur="onRealNumberBlur(item, idx, 'widthTolPos')" />
                             </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" placeholder="请输入宽度公差 -"
+                                <uni-easyinput type="number" v-model="item.widthTolNeg" placeholder="请输入宽度公差下限"
                                     :inputBorder="false"
                                     :inputBorder="false"
-                                    @input="onNonNegativeNumberInput($event, item, idx, 'widthTolNeg')"
-                                    @blur="onNonNegativeNumberBlur(item, idx, 'widthTolNeg')" />
+                                    @input="onRealNumberInput($event, item, idx, 'widthTolNeg')"
+                                    @blur="onRealNumberBlur(item, idx, 'widthTolNeg')" />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="长度(mm)">
                         <uni-list-item title="长度(mm)">
@@ -88,20 +88,20 @@
                                     @blur="onNonNegativeNumberBlur(item, idx, 'length')" />
                                     @blur="onNonNegativeNumberBlur(item, idx, 'length')" />
                             </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.lengthTolPos" placeholder="请输入长度公差 +"
+                                <uni-easyinput type="number" v-model="item.lengthTolPos" placeholder="请输入长度公差上限"
                                     :inputBorder="false"
                                     :inputBorder="false"
-                                    @input="onNonNegativeNumberInput($event, item, idx, 'lengthTolPos')"
-                                    @blur="onNonNegativeNumberBlur(item, idx, 'lengthTolPos')" />
+                                    @input="onRealNumberInput($event, item, idx, 'lengthTolPos')"
+                                    @blur="onRealNumberBlur(item, idx, 'lengthTolPos')" />
                             </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" placeholder="请输入长度公差 -"
+                                <uni-easyinput type="number" v-model="item.lengthTolNeg" placeholder="请输入长度公差下限"
                                     :inputBorder="false"
                                     :inputBorder="false"
-                                    @input="onNonNegativeNumberInput($event, item, idx, 'lengthTolNeg')"
-                                    @blur="onNonNegativeNumberBlur(item, idx, 'lengthTolNeg')" />
+                                    @input="onRealNumberInput($event, item, idx, 'lengthTolNeg')"
+                                    @blur="onRealNumberBlur(item, idx, 'lengthTolNeg')" />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="状态">
                         <uni-list-item title="状态">
@@ -178,22 +178,26 @@
                     <view class="value value-spec">
                     <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_val">{{ item.thickness }}</view>
                         <view v-if="item.thickness" class="value-spec_box">
                         <view v-if="item.thickness" class="value-spec_box">
-                            <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }}
+                            <view v-if="item.thicknessTolPos" class="value-spec_box_1">{{ item.thicknessTolPos > 0 ? '+' + item.thicknessTolPos : item.thicknessTolPos }}
                             </view>
                             </view>
-                            <view v-if="item.thicknessTolNeg" class="value-spec_box_2">-{{ item.thicknessTolNeg }}
+                            <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg > 0 ? '+' + item.thicknessTolNeg : item.thicknessTolNeg }}
                             </view>
                             </view>
                         </view>
                         </view>
                         <view v-if="item.width" class="value-spec_val p12">*</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_val">{{ item.width }}</view>
                         <view v-if="item.width" class="value-spec_box">
                         <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.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>
                         <view v-if="item.length" class="value-spec_val p12">*</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_val">{{ item.length }}</view>
                         <view v-if="item.length" class="value-spec_box">
                         <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.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>
@@ -274,7 +278,7 @@ export default {
         const init = Array.isArray(this.list) && this.list.length > 0 ? this.list.map(v => ({ ...this.defaultItem(), ...v, collapsed: false })) : [{ ...this.defaultItem(), collapsed: false }]
         const init = Array.isArray(this.list) && this.list.length > 0 ? this.list.map(v => ({ ...this.defaultItem(), ...v, collapsed: false })) : [{ ...this.defaultItem(), collapsed: false }]
         this.items = init
         this.items = init
     },
     },
-    methods: {
+        methods: {
         defaultItem() {
         defaultItem() {
             return {
             return {
                 id: '',
                 id: '',
@@ -302,7 +306,6 @@ export default {
         },
         },
 
 
         onAdd() {
         onAdd() {
-            if (this.items.length >= this.max) return uni.showToast({ title: `最多添加${this.max}个`, icon: 'none' })
             const obj = this.defaultItem()
             const obj = this.defaultItem()
             obj.collapsed = true
             obj.collapsed = true
             this.items.push(obj)
             this.items.push(obj)
@@ -358,6 +361,25 @@ export default {
             if (isNaN(num) || num < 0) item[field] = '0'
             if (isNaN(num) || num < 0) item[field] = '0'
             if (typeof idx === 'number') this.$set(this.items, idx, { ...item })
             if (typeof idx === 'number') this.$set(this.items, idx, { ...item })
         },
         },
+        onRealNumberInput(val, item, idx, field) {
+            let s = String(val != null ? val : (item && item[field]) || '')
+            const neg = s.trim().startsWith('-')
+            s = s.replace(/[^0-9.\-]/g, '')
+            s = s.replace(/(?!^)-/g, '')
+            s = s.replace(/(\..*)\./g, '$1')
+            if (s.startsWith('.')) s = '0' + s
+            if (s.startsWith('-.')) s = '-0.' + s.slice(2)
+            if (neg && !s.startsWith('-')) s = '-' + s.replace(/-/g, '')
+            item[field] = s
+            if (typeof idx === 'number') this.$set(this.items, idx, { ...item })
+        },
+        onRealNumberBlur(item, idx, field) {
+            const s = String((item && item[field]) || '')
+            if (s === '') { if (typeof idx === 'number') this.$set(this.items, idx, { ...item }); return }
+            const n = Number(s)
+            if (isNaN(n)) item[field] = ''
+            if (typeof idx === 'number') this.$set(this.items, idx, { ...item })
+        },
         toggleViewCollapse() {
         toggleViewCollapse() {
             this.collapsedView = !this.collapsedView
             this.collapsedView = !this.collapsedView
         },
         },

@@ -21,7 +21,12 @@
                         <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>
-
+                <uni-list-item class="select-item" :class="form.stockUpCompanyId ? 'is-filled' : 'is-empty'" clickable
+                    @click="openRelate('stockUpCompanyId')" :rightText="form.stockUpCompanyName || '请选择备货单位'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text class="required">*</text><text>备货单位/人（生产标准）</text></view>
+                    </template>
+                </uni-list-item>
                 <uni-list-item title="订货日期">
                 <uni-list-item title="订货日期">
                     <template v-slot:footer>
                     <template v-slot:footer>
                         <uni-datetime-picker type="date" v-model="form.orderDate" />
                         <uni-datetime-picker type="date" v-model="form.orderDate" />
@@ -39,7 +44,23 @@
 						<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 mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" @change="onProductsChange" :options="productList" />
+                <uni-list-item class="select-item" :class="form.deptName ? 'is-filled' : 'is-empty'">
+                <template v-slot:body>
+                    <view class="item-title"><text class="required">*</text><text>办事处</text></view>
+                </template>
+                <template v-slot:footer>
+                    <view class="serial-number-row">
+                    <uni-easyinput v-model="form.deptName" :inputBorder="false" disabled />
+                    </view>
+                </template>
+                </uni-list-item>
+                <uni-list-item class="select-item" :class="form.region ? 'is-filled' : 'is-empty'" clickable
+                @click="openSheet('region')" :rightText="displayLabel('regionName')" showArrow>
+                <template v-slot:body>
+                    <view class="item-title"><text class="required">*</text><text>区域</text></view>
+                </template>
+                </uni-list-item>
+                <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 />
@@ -208,10 +229,12 @@ import SingleSelectSheet from '@/components/single-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
 import ProductRel from './productRel.vue'
 import ProductRel from './productRel.vue'
 import CitySelector from '@/components/city-selector/index.vue'
 import CitySelector from '@/components/city-selector/index.vue'
-import { getRetailCodeApi, createContractApi, getCustomerRemarks,getCustomerSpecificQualityRequirements } from '@/api/contract'
+import { getRetailCodeApi, createContractApi, getCustomerRemarks,getCustomerSpecificQualityRequirements,getDeptApi } from '@/api/contract'
 import { getDicByCodes } from '@/utils/dic'
 import { getDicByCodes } from '@/utils/dic'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { workshopQueryApi } from '@/api/devManage'
 import { workshopQueryApi } from '@/api/devManage'
+import { getArea } from '@/api/credit_manage.js'
+
 
 
 export default {
 export default {
     name: 'AddContractForeignStd',
     name: 'AddContractForeignStd',
@@ -223,7 +246,11 @@ export default {
                 supplier: '',
                 supplier: '',
                 supplierName: '',
                 supplierName: '',
                 buyer: '',
                 buyer: '',
+                region: '',
+                regionName: '',
                 buyerName: '',
                 buyerName: '',
+                stockUpCompanyId: '',
+                stockUpCompanyName: '',
                 orderDate: '',
                 orderDate: '',
                 deliveryDate: '',
                 deliveryDate: '',
                 designatedConsignee: '',
                 designatedConsignee: '',
@@ -249,6 +276,8 @@ export default {
                 pieceWeightHead: '',
                 pieceWeightHead: '',
                 surface: '',
                 surface: '',
                 tolerance: '',
                 tolerance: '',
+                deptName: '',
+                deptId: '',
             },
             },
             supplierList: [],
             supplierList: [],
             specialTermsList: [],
             specialTermsList: [],
@@ -263,12 +292,15 @@ export default {
             productList: [],
             productList: [],
             customerRemarks: [],
             customerRemarks: [],
             defaultRemark: '',
             defaultRemark: '',
+            regionOptions: [],
         }
         }
     },
     },
     created() {
     created() {
         this.loadSuppliers()
         this.loadSuppliers()
         this.loadExtraOptions()
         this.loadExtraOptions()
         this.initCode()
         this.initCode()
+        this.getDept()
+        this.loadRegionOptions()
         this.form.orderDate = this.formatDate(new Date())
         this.form.orderDate = this.formatDate(new Date())
         this.$nextTick(() => {
         this.$nextTick(() => {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
@@ -318,6 +350,24 @@ export default {
         },
         },
     },
     },
     methods: {
     methods: {
+        async loadRegionOptions() {
+            try {
+                const res = await getArea()
+                const list = res.data || []
+                this.regionOptions = (list || []).map(it => ({ label: it.name || '', value: it.id || '' }))
+            } catch (e) {
+                this.regionOptions = []
+            }
+        },
+        // 查询当前人所在办事处
+        getDept() {
+            getDeptApi().then(res => {
+                if (res.code === 200) {
+                    this.form.deptName = res.data.name || ''
+                    this.form.deptId = res.data.id || ''
+                }
+            })
+        },
         getHistory() {
         getHistory() {
             if (!this.productLineList.length || !this.productLineList[0].productId) {
             if (!this.productLineList.length || !this.productLineList[0].productId) {
                 return;
                 return;
@@ -403,7 +453,7 @@ export default {
         },
         },
         displayLabel(field) {
         displayLabel(field) {
             const m = this.form
             const m = this.form
-            const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopIdName: '请选择生产厂' }
+            const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopIdName: '请选择生产厂', regionName: '请选择区域' }
             const val = m[field]
             const val = m[field]
             return val ? String(val) : map[field]
             return val ? String(val) : map[field]
         },
         },
@@ -448,6 +498,8 @@ export default {
                 setSheet('单价中是否已包含运费', this.yesNoList)
                 setSheet('单价中是否已包含运费', this.yesNoList)
             } else if (field === 'historyRemarks') {
             } else if (field === 'historyRemarks') {
                 setSheet('历史备注', this.customerRemarks)
                 setSheet('历史备注', this.customerRemarks)
+            }else if (field === 'region') {
+                setSheet('区域', this.regionOptions)
             }
             }
         },
         },
         onSheetConfirm({ value, label }) {
         onSheetConfirm({ value, label }) {
@@ -466,6 +518,8 @@ export default {
             let config = {}
             let config = {}
             if (fieldKey === 'buyer') {
             if (fieldKey === 'buyer') {
                 config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
                 config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
+            } else if (fieldKey === 'stockUpCompanyId') {
+                config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
             }
             }
             const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
             const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
             this.sheet.visible = false
             this.sheet.visible = false
@@ -476,7 +530,17 @@ export default {
             const _fieldKey = this.relate.fieldKey
             const _fieldKey = this.relate.fieldKey
             const first = (items && items.length > 0) ? items[0] : null
             const first = (items && items.length > 0) ? items[0] : null
             this.form[_fieldKey] = (first && first.id) ? first.id : ''
             this.form[_fieldKey] = (first && first.id) ? first.id : ''
-            this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : ''
+            
+            if (_fieldKey === 'stockUpCompanyId') {
+                 this.form.stockUpCompanyName = (first && first.name) ? first.name : ''
+            } else {
+                 this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : ''
+            }
+            
+            if (_fieldKey === 'buyer') {
+                this.form.stockUpCompanyId = (first && first.id) ? first.id : ''
+                this.form.stockUpCompanyName = (first && first.name) ? first.name : ''
+            }
         },
         },
         onRadioSelect(field, nameField, opt) {
         onRadioSelect(field, nameField, opt) {
             const val = opt && opt.value != null ? opt.value : ''
             const val = opt && opt.value != null ? opt.value : ''
@@ -532,10 +596,12 @@ export default {
                 { key: 'code', label: '编号' },
                 { key: 'code', label: '编号' },
                 { key: 'supplier', label: '供方' },
                 { key: 'supplier', label: '供方' },
                 { key: 'buyer', label: '需方' },
                 { key: 'buyer', label: '需方' },
+                { key: 'stockUpCompanyId', label: '备货单位/人（生产标准）' },
                 { key: 'orderDate', label: '订货日期' },
                 { key: 'orderDate', label: '订货日期' },
                 { key: 'unit', label: '单位' },
                 { key: 'unit', label: '单位' },
                 { key: 'workshopId', label: '生产厂' },
                 { key: 'workshopId', label: '生产厂' },
                 { key: 'specialTerms', label: '特别条款要求' },
                 { key: 'specialTerms', label: '特别条款要求' },
+                { key: 'region', label: '区域' },
             ]
             ]
             for (const it of checks) {
             for (const it of checks) {
                 const val = this.form[it.key]
                 const val = this.form[it.key]
@@ -561,6 +627,7 @@ export default {
                     uni.showToast({ title: `第${idx + 1}条明细未完整填写`, icon: 'none' }); return false
                     uni.showToast({ title: `第${idx + 1}条明细未完整填写`, icon: 'none' }); return false
                 }
                 }
             }
             }
+            if (this.$refs.productRel && !this.$refs.productRel.validate()) return false
             return true
             return true
         }
         }
     }
     }

@@ -10,11 +10,17 @@
                     }}</text></view>
                     }}</text></view>
                     <view class="row"><text class="label">需方</text><text class="value">{{ detail.buyerName || '-'
                     <view class="row"><text class="label">需方</text><text class="value">{{ detail.buyerName || '-'
                     }}</text></view>
                     }}</text></view>
+                    <view class="row"><text class="label">备货单位/人（生产标准）</text><text class="value">{{ detail.stockUpCompanyName || '-'
+                    }}</text></view>
                     <view class="row"><text class="label">订货日期</text><text class="value">{{ detail.orderDate }}</text>
                     <view class="row"><text class="label">订货日期</text><text class="value">{{ detail.orderDate }}</text>
                     </view>
                     </view>
                     <view class="row"><text class="label">单位</text><text class="value">{{ detail.unit }}</text></view>
                     <view class="row"><text class="label">单位</text><text class="value">{{ detail.unit }}</text></view>
                     <view class="row"><text class="label">生产厂</text><text class="value">{{ detail.workshopName || '-'
                     <view class="row"><text class="label">生产厂</text><text class="value">{{ detail.workshopName || '-'
                     }}</text></view>
                     }}</text></view>
+                    <view class="row"><text class="label">办事处</text><text class="value">{{ detail.deptName || '-'
+                    }}</text></view>
+                    <view class="row"><text class="label">区域</text><text class="value">{{ detail.regionName || '-'
+                    }}</text></view>
                 </view>
                 </view>
 
 
                 <view class="section1">
                 <view class="section1">
@@ -133,10 +139,15 @@ export default {
                 supplierName: '',
                 supplierName: '',
                 buyer: '',
                 buyer: '',
                 buyerName: '',
                 buyerName: '',
+                stockUpCompanyId: '',
+                stockUpCompanyName: '',
                 orderDate: '',
                 orderDate: '',
                 unit: '',
                 unit: '',
                 workshopId: '',
                 workshopId: '',
                 workshopName: '',
                 workshopName: '',
+                region: '',
+                regionName: '',
+                deptName: '',
                 designatedConsignee: '',
                 designatedConsignee: '',
                 specialTerms: '',
                 specialTerms: '',
                 specialTermsName: '',
                 specialTermsName: '',
@@ -380,6 +391,9 @@ export default {
                 this.detail = {
                 this.detail = {
                     ...this.detail,
                     ...this.detail,
                     ...data,
                     ...data,
+                    stockUpCompanyName: data.stockUpCompanyName || '',
+                    regionName: data.regionName || '',
+                    deptName: data.deptName || '',
                     includesPackagingFeeName, includesTransportFeeName,
                     includesPackagingFeeName, includesTransportFeeName,
                     destinationId: data.provinceId && data.cityId && data.districtId ? [data.provinceId, data.cityId, data.districtId] : '',
                     destinationId: data.provinceId && data.cityId && data.districtId ? [data.provinceId, data.cityId, data.districtId] : '',
                     destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '',
                     destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '',

@@ -21,6 +21,12 @@
                         <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>
+                <uni-list-item class="select-item" :class="form.stockUpCompanyId ? 'is-filled' : 'is-empty'" clickable
+                    @click="openRelate('stockUpCompanyId')" :rightText="form.stockUpCompanyName || '请选择备货单位'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text class="required">*</text><text>备货单位/人（生产标准）</text></view>
+                    </template>
+                </uni-list-item>
 
 
                 <uni-list-item class="select-item" :class="form.workshopId ? 'is-filled' : 'is-empty'" clickable
                 <uni-list-item class="select-item" :class="form.workshopId ? 'is-filled' : 'is-empty'" clickable
                     @click="openSheet('workshopId')" :rightText="form.workshopName || '请选择生产厂'" showArrow>
                     @click="openSheet('workshopId')" :rightText="form.workshopName || '请选择生产厂'" showArrow>
@@ -28,6 +34,22 @@
                         <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>
+                <uni-list-item class="select-item" :class="form.deptName ? 'is-filled' : 'is-empty'">
+                <template v-slot:body>
+                    <view class="item-title"><text class="required">*</text><text>办事处</text></view>
+                </template>
+                <template v-slot:footer>
+                    <view class="serial-number-row">
+                    <uni-easyinput v-model="form.deptName" :inputBorder="false" disabled />
+                    </view>
+                </template>
+                </uni-list-item>
+                <uni-list-item class="select-item" :class="form.region ? 'is-filled' : 'is-empty'" clickable
+                @click="openSheet('region')" :rightText="displayLabel('regionName')" showArrow>
+                <template v-slot:body>
+                    <view class="item-title"><text class="required">*</text><text>区域</text></view>
+                </template>
+                </uni-list-item>
 
 
                 <uni-list-item title="订货日期">
                 <uni-list-item title="订货日期">
                     <template v-slot:footer>
                     <template v-slot:footer>
@@ -40,7 +62,7 @@
                         <uni-easyinput v-model="form.unit" :inputBorder="false" disabled />
                         <uni-easyinput v-model="form.unit" :inputBorder="false" disabled />
                     </template>
                     </template>
                 </uni-list-item>
                 </uni-list-item>
-                <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"
@@ -196,6 +218,7 @@ import { getContractApi, updateContractApi } from '@/api/contract'
 import { getDicByCodes } from '@/utils/dic'
 import { getDicByCodes } from '@/utils/dic'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { workshopQueryApi } from '@/api/devManage'
 import { workshopQueryApi } from '@/api/devManage'
+import { getArea } from '@/api/credit_manage.js'
 export default {
 export default {
     name: 'ModifyContractForeignStd',
     name: 'ModifyContractForeignStd',
     components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector },
     components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector },
@@ -209,8 +232,14 @@ export default {
                 supplierName: '',
                 supplierName: '',
                 buyer: '',
                 buyer: '',
                 buyerName: '',
                 buyerName: '',
+                stockUpCompanyId: '',
+                stockUpCompanyName: '',
                 workshopId: '',
                 workshopId: '',
                 workshopName: '',
                 workshopName: '',
+                region: '',
+                regionName: '',
+                deptName: '',
+                deptId: '',
                 orderDate: '',
                 orderDate: '',
                 deliveryDate: '',
                 deliveryDate: '',
                 designatedConsignee: '',
                 designatedConsignee: '',
@@ -251,7 +280,8 @@ export default {
             totalAmountIncludingTax: 0,
             totalAmountIncludingTax: 0,
             productLineList: [],
             productLineList: [],
             newProductLineList: [],
             newProductLineList: [],
-            productList: []
+            productList: [],
+            regionOptions: []
         }
         }
     },
     },
     onLoad(query) {
     onLoad(query) {
@@ -260,6 +290,7 @@ export default {
     created() {
     created() {
         this.loadSuppliers()
         this.loadSuppliers()
         this.loadExtraOptions()
         this.loadExtraOptions()
+        this.loadRegionOptions()
         this.loadDetail()
         this.loadDetail()
         this.$nextTick(() => {
         this.$nextTick(() => {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
@@ -268,6 +299,15 @@ export default {
         })
         })
     },
     },
     methods: {
     methods: {
+        async loadRegionOptions() {
+            try {
+                const res = await getArea()
+                const list = res.data || []
+                this.regionOptions = (list || []).map(it => ({ label: it.name || '', value: it.id || '' }))
+            } catch (e) {
+                this.regionOptions = []
+            }
+        },
         async loadDetail() {
         async loadDetail() {
             if (!this.id) return
             if (!this.id) return
             try {
             try {
@@ -284,6 +324,8 @@ export default {
                     supplierName: m.supplierName || '',
                     supplierName: m.supplierName || '',
                     buyer: m.buyer || (m.customer && m.customer.id) || '',
                     buyer: m.buyer || (m.customer && m.customer.id) || '',
                     buyerName: m.buyerName || (m.customer && m.customer.name) || '',
                     buyerName: m.buyerName || (m.customer && m.customer.name) || '',
+                    stockUpCompanyId: m.stockUpCompanyId || '',
+                    stockUpCompanyName: m.stockUpCompanyName || '',
                     orderDate: m.orderDate || '',
                     orderDate: m.orderDate || '',
                     designatedConsignee: m.designatedConsignee || '',
                     designatedConsignee: m.designatedConsignee || '',
                     specialTerms: m.specialTerms || '',
                     specialTerms: m.specialTerms || '',
@@ -313,6 +355,10 @@ export default {
                     packaging: m.packaging || '',
                     packaging: m.packaging || '',
                     workshopId: m.workshopId || '',
                     workshopId: m.workshopId || '',
                     workshopName: m.workshopName || '',
                     workshopName: m.workshopName || '',
+                    region: m.region || '',
+                    regionName: m.regionName || '',
+                    deptName: m.deptName || '',
+                    deptId: m.deptId || '',
                 }
                 }
                 const lines = Array.isArray(m.contractDistributorLineList) ? m.contractDistributorLineList : []
                 const lines = Array.isArray(m.contractDistributorLineList) ? m.contractDistributorLineList : []
                 this.productLineList = lines
                 this.productLineList = lines
@@ -368,7 +414,7 @@ export default {
         },
         },
         displayLabel(field) {
         displayLabel(field) {
             const m = this.form
             const m = this.form
-            const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopName: '请选择生产厂' }
+            const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopName: '请选择生产厂', regionName: '请选择区域' }
             const val = m[field]
             const val = m[field]
             return val ? String(val) : map[field]
             return val ? String(val) : map[field]
         },
         },
@@ -397,6 +443,8 @@ export default {
                 setSheet('单价中是否已包含包装费', this.yesNoList)
                 setSheet('单价中是否已包含包装费', this.yesNoList)
             } else if (field === 'includesTransportFee') {
             } else if (field === 'includesTransportFee') {
                 setSheet('单价中是否已包含运费', this.yesNoList)
                 setSheet('单价中是否已包含运费', this.yesNoList)
+            } else if (field === 'region') {
+                setSheet('区域', this.regionOptions)
             }
             }
         },
         },
         onSheetConfirm({ value, label }) {
         onSheetConfirm({ value, label }) {
@@ -410,6 +458,8 @@ export default {
             let config = {}
             let config = {}
             if (fieldKey === 'buyer') {
             if (fieldKey === 'buyer') {
                 config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
                 config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
+            } else if (fieldKey === 'stockUpCompanyId') {
+                config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
             }
             }
             const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
             const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
             this.sheet.visible = false
             this.sheet.visible = false
@@ -420,7 +470,12 @@ export default {
             const _fieldKey = this.relate.fieldKey
             const _fieldKey = this.relate.fieldKey
             const first = (items && items.length > 0) ? items[0] : null
             const first = (items && items.length > 0) ? items[0] : null
             this.form[_fieldKey] = (first && first.id) ? first.id : ''
             this.form[_fieldKey] = (first && first.id) ? first.id : ''
-            this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : ''
+
+            if (_fieldKey === 'stockUpCompanyId') {
+                 this.form.stockUpCompanyName = (first && first.name) ? first.name : ''
+            } else {
+                 this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : ''
+            }
         },
         },
         onRadioSelect(field, nameField, opt) {
         onRadioSelect(field, nameField, opt) {
             const val = opt && opt.value != null ? opt.value : ''
             const val = opt && opt.value != null ? opt.value : ''
@@ -436,9 +491,11 @@ export default {
                 { key: 'code', label: '编号' },
                 { key: 'code', label: '编号' },
                 { key: 'supplier', label: '供方' },
                 { key: 'supplier', label: '供方' },
                 { key: 'buyer', label: '需方' },
                 { key: 'buyer', label: '需方' },
+                { key: 'stockUpCompanyId', label: '备货单位/人（生产标准）' },
                 { key: 'orderDate', label: '订货日期' },
                 { key: 'orderDate', label: '订货日期' },
                 { key: 'unit', label: '单位' },
                 { key: 'unit', label: '单位' },
                 { key: 'workshopId', label: '生产厂' },
                 { key: 'workshopId', label: '生产厂' },
+                { key: 'region', label: '区域' },
                 { key: 'specialTerms', label: '特别条款要求' },
                 { key: 'specialTerms', label: '特别条款要求' },
             ]
             ]
             for (const it of checks) {
             for (const it of checks) {
@@ -466,6 +523,7 @@ export default {
                     uni.showToast({ title: `第${idx + 1}条明细未完整填写`, icon: 'none' }); return false
                     uni.showToast({ title: `第${idx + 1}条明细未完整填写`, icon: 'none' }); return false
                 }
                 }
             }
             }
+            if (this.$refs.productRel && !this.$refs.productRel.validate()) return false
             return true
             return true
         },
         },
         async onSubmit() {
         async onSubmit() {

@@ -55,51 +55,51 @@
                     </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.thickness" :inputBorder="false" placeholder="请输入厚度" @input="onNonNegativeInput(idx, 'thickness')" @blur="onNonNegativeBlur(idx, 'thickness', 2)" />
+                            <uni-easyinput type="digit" v-model="item.thickness" :inputBorder="false" placeholder="请输入厚度" @input="onNonNegativeInput(idx, 'thickness')" @blur="onNonNegativeBlur(idx, 'thickness', 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.thicknessTolPos" :inputBorder="false"
-                                placeholder="请输入厚度公差上限" @input="onNonNegativeInput(idx, 'thicknessTolPos')" @blur="onNonNegativeBlur(idx, 'thicknessTolPos', 2)" />
+                            <uni-easyinput type="text" v-model="item.thicknessTolPos" :inputBorder="false"
+                                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"
-                                placeholder="请输入厚度公差下限" @input="onNonNegativeInput(idx, 'thicknessTolNeg')" @blur="onNonNegativeBlur(idx, 'thicknessTolNeg', 2)" />
+                            <uni-easyinput type="text" v-model="item.thicknessTolNeg" :inputBorder="false"
+                                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)">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput type="digit" v-model="item.width" :inputBorder="false" placeholder="请输入宽度" @input="onNonNegativeInput(idx, 'width')" @blur="onNonNegativeBlur(idx, 'width', 2)" />
+                            <uni-easyinput type="digit" v-model="item.width" :inputBorder="false" placeholder="请输入宽度" @input="onNonNegativeInput(idx, 'width')" @blur="onNonNegativeBlur(idx, 'width', 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.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差上限" @input="onNonNegativeInput(idx, 'widthTolPos')" @blur="onNonNegativeBlur(idx, 'widthTolPos', 2)" />
+                            <uni-easyinput type="text" 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', 2)" />
+                            <uni-easyinput type="text" 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)">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput type="digit" v-model="item.length" :inputBorder="false" placeholder="请输入长度" @input="onNonNegativeInput(idx, 'length')" @blur="onNonNegativeBlur(idx, 'length', 2)" />
+                            <uni-easyinput type="digit" v-model="item.length" :inputBorder="false" placeholder="请输入长度" @input="onNonNegativeInput(idx, 'length')" @blur="onNonNegativeBlur(idx, 'length', 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.lengthTolPos" :inputBorder="false"
-                                placeholder="请输入长度公差上限" @input="onNonNegativeInput(idx, 'lengthTolPos')" @blur="onNonNegativeBlur(idx, 'lengthTolPos', 2)" />
+                            <uni-easyinput type="text" v-model="item.lengthTolPos" :inputBorder="false"
+                                placeholder="请输入长度公差上限" @input="onNumberInput(idx, 'lengthTolPos')" @blur="onNumberBlur(idx, 'lengthTolPos', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="长度公差下限(mm)">
                     <uni-list-item title="长度公差下限(mm)">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false"
-                                placeholder="请输入长度公差下限" @input="onNonNegativeInput(idx, 'lengthTolNeg')" @blur="onNonNegativeBlur(idx, 'lengthTolNeg', 2)" />
+                            <uni-easyinput type="text" v-model="item.lengthTolNeg" :inputBorder="false"
+                                placeholder="请输入长度公差下限" @input="onNumberInput(idx, 'lengthTolNeg')" @blur="onNumberBlur(idx, 'lengthTolNeg', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="状态">
                     <uni-list-item title="状态">
@@ -109,12 +109,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.quantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'quantity')" @blur="onNonNegativeBlur(idx, 'quantity', 2)" />
+                            <uni-easyinput v-model="item.quantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'quantity')" @blur="onNonNegativeBlur(idx, 'quantity', 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.unitPrice" type="digit" :inputBorder="false" placeholder="请输入销售价格" @input="onNonNegativeInput(idx, 'unitPrice')" @blur="onNonNegativeBlur(idx, 'unitPrice', 2)" />
+                            <uni-easyinput v-model="item.unitPrice" type="digit" :inputBorder="false" placeholder="请输入销售价格" @input="onNonNegativeInput(idx, 'unitPrice')" @blur="onNonNegativeBlur(idx, 'unitPrice', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="外贸加工费">
                     <uni-list-item title="外贸加工费">
@@ -302,6 +302,62 @@ export default {
             this.$set(this.items, idx, it)
             this.$set(this.items, idx, it)
             if (field === 'quantity' || field === 'unitPrice') this.recalculate(idx)
             if (field === 'quantity' || field === 'unitPrice') this.recalculate(idx)
         },
         },
+        onNumberInput(idx, field) {
+            const it = this.items[idx]
+            if (!it) return
+            let v = String(it[field] != null ? it[field] : '')
+            v = v.replace(/[^0-9.-]/g, '')
+            if (v.lastIndexOf('-') > 0) {
+                const hasMinusAtStart = v.startsWith('-')
+                v = v.replace(/-/g, '')
+                if (hasMinusAtStart) v = '-' + v
+            }
+            if ((v.match(/\./g) || []).length > 1) {
+                const firstDotIndex = v.indexOf('.')
+                v = v.substring(0, firstDotIndex + 1) + v.substring(firstDotIndex + 1).replace(/\./g, '')
+            }
+            if (v.startsWith('.')) v = '0' + v
+            if (v.startsWith('-.')) v = '-0' + v.substring(1)
+            it[field] = v
+            this.$set(this.items, idx, it)
+        },
+        onNumberBlur(idx, field, digits) {
+            const it = this.items[idx]
+            if (!it) return
+            const raw = it[field]
+            if (raw === '' || raw === null || raw === undefined || raw === '-') {
+                this.$set(this.items, idx, it)
+                return
+            }
+            let num = this.toNumber(raw)
+            if (isNaN(num)) num = 0
+            const rounded = this.round(num, digits)
+            it[field] = rounded
+            this.$set(this.items, idx, it)
+        },
+        validate() {
+            for (let i = 0; i < this.items.length; i++) {
+                const it = this.items[i]
+                const check = (pos, neg, label) => {
+                    if (pos !== '' && pos !== null && pos !== undefined &&
+                        neg !== '' && neg !== null && neg !== undefined) {
+                        if (Number(pos) <= Number(neg)) {
+                            return `第${i + 1}行产品：${label}公差上限必须大于下限`
+                        }
+                    }
+                    return null
+                }
+                let err = check(it.thicknessTolPos, it.thicknessTolNeg, '厚度')
+                if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
+                
+                err = check(it.widthTolPos, it.widthTolNeg, '宽度')
+                if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
+                
+                err = check(it.lengthTolPos, it.lengthTolNeg, '长度')
+                if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
+            }
+            return true
+        },
         formatCurrency(val) {
         formatCurrency(val) {
             if (val == null || val === '') return ''
             if (val == null || val === '') return ''
             const num = Number(val)
             const num = Number(val)

@@ -22,6 +22,13 @@
                     </template>
                     </template>
                 </uni-list-item>
                 </uni-list-item>
 
 
+                <uni-list-item class="select-item" :class="form.stockUpCompanyId ? 'is-filled' : 'is-empty'" clickable
+                    @click="openRelate('stockUpCompanyId')" :rightText="form.stockUpCompanyName || '请选择备货单位'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text class="required">*</text><text>备货单位/人（生产标准）</text></view>
+                    </template>
+                </uni-list-item>
+
                 <uni-list-item title="订货日期">
                 <uni-list-item title="订货日期">
                     <template v-slot:footer>
                     <template v-slot:footer>
                         <uni-datetime-picker type="date" v-model="form.orderDate" />
                         <uni-datetime-picker type="date" v-model="form.orderDate" />
@@ -39,7 +46,24 @@
 						<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 mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" @change="onProductsChange" :options="productList" />
+                <uni-list-item class="select-item" :class="form.deptName ? 'is-filled' : 'is-empty'">
+                    <template v-slot:body>
+                        <view class="item-title"><text class="required">*</text><text>办事处</text></view>
+                    </template>
+                    <template v-slot:footer>
+                        <view class="serial-number-row">
+                            <uni-easyinput v-model="form.deptName" :inputBorder="false" disabled />
+                        </view>
+                    </template>
+                </uni-list-item>
+                <uni-list-item class="select-item" :class="form.region ? 'is-filled' : 'is-empty'" clickable
+                    @click="openSheet('region')" :rightText="displayLabel('regionName')" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text class="required">*</text><text>区域</text></view>
+                    </template>
+                </uni-list-item>
+                <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 />
@@ -208,10 +232,11 @@ import SingleSelectSheet from '@/components/single-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
 import ProductRel from './productRel.vue'
 import ProductRel from './productRel.vue'
 import CitySelector from '@/components/city-selector/index.vue'
 import CitySelector from '@/components/city-selector/index.vue'
-import { getRetailCodeApi, createContractApi, getCustomerSpecificQualityRequirements,getCustomerRemarks } from '@/api/contract'
+import { getRetailCodeApi, createContractApi, getCustomerSpecificQualityRequirements,getCustomerRemarks, getDeptApi } from '@/api/contract'
 import { getDicByCodes } from '@/utils/dic'
 import { getDicByCodes } from '@/utils/dic'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { workshopQueryApi } from '@/api/devManage'
 import { workshopQueryApi } from '@/api/devManage'
+import { getArea } from '@/api/credit_manage.js'
 
 
 export default {
 export default {
     name: 'AddContractForeignStock',
     name: 'AddContractForeignStock',
@@ -224,6 +249,8 @@ export default {
                 supplierName: '',
                 supplierName: '',
                 buyer: '',
                 buyer: '',
                 buyerName: '',
                 buyerName: '',
+                stockUpCompanyId: '',
+                stockUpCompanyName: '',
                 orderDate: '',
                 orderDate: '',
                 deliveryDate: '',
                 deliveryDate: '',
                 designatedConsignee: '',
                 designatedConsignee: '',
@@ -242,7 +269,11 @@ export default {
                 destinationLabel: '',
                 destinationLabel: '',
                 workshopIdName: '',
                 workshopIdName: '',
                 workshopId: '',
                 workshopId: '',
-                component: '',
+                deptName: '',
+                deptId: '',
+                region: '',
+                regionName: '',
+                remarks: '',
                 packaging: '',
                 packaging: '',
                 performance: '',
                 performance: '',
                 pieceWeightHead: '',
                 pieceWeightHead: '',
@@ -263,12 +294,15 @@ export default {
             productList: [],
             productList: [],
             customerRemarks: [],
             customerRemarks: [],
             defaultRemark: '',
             defaultRemark: '',
+            regionOptions: [],
         }
         }
     },
     },
     created() {
     created() {
         this.loadSuppliers()
         this.loadSuppliers()
         this.loadExtraOptions()
         this.loadExtraOptions()
         this.initCode()
         this.initCode()
+        this.getDept()
+        this.loadRegionOptions()
         this.form.orderDate = this.formatDate(new Date())
         this.form.orderDate = this.formatDate(new Date())
         this.$nextTick(() => {
         this.$nextTick(() => {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
@@ -318,6 +352,24 @@ export default {
         },
         },
     },
     },
     methods: {
     methods: {
+        async loadRegionOptions() {
+            try {
+                const res = await getArea()
+                const list = res.data || []
+                this.regionOptions = (list || []).map(it => ({ label: it.name || '', value: it.id || '' }))
+            } catch (e) {
+                this.regionOptions = []
+            }
+        },
+        // 查询当前人所在办事处
+        getDept() {
+            getDeptApi().then(res => {
+                if (res.code === 200) {
+                    this.form.deptName = res.data.name || ''
+                    this.form.deptId = res.data.id || ''
+                }
+            })
+        },
         getHistory() {
         getHistory() {
             console.log('this.productLineList', this.productLineList[0].productId)
             console.log('this.productLineList', this.productLineList[0].productId)
             if (!this.productLineList.length || !this.productLineList[0].productId) {
             if (!this.productLineList.length || !this.productLineList[0].productId) {
@@ -405,7 +457,7 @@ export default {
         },
         },
         displayLabel(field) {
         displayLabel(field) {
             const m = this.form
             const m = this.form
-            const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopIdName: '请选择生产厂' }
+            const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopIdName: '请选择生产厂', regionName: '请选择区域' }
             const val = m[field]
             const val = m[field]
             return val ? String(val) : map[field]
             return val ? String(val) : map[field]
         },
         },
@@ -450,6 +502,8 @@ export default {
                 setSheet('单价中是否已包含运费', this.yesNoList)
                 setSheet('单价中是否已包含运费', this.yesNoList)
             } else if (field === 'historyRemarks') {
             } else if (field === 'historyRemarks') {
                 setSheet('历史备注', this.customerRemarks)
                 setSheet('历史备注', this.customerRemarks)
+            }else if (field === 'region') {
+                setSheet('区域', this.regionOptions)
             }
             }
         },
         },
         onSheetConfirm({ value, label }) {
         onSheetConfirm({ value, label }) {
@@ -468,6 +522,8 @@ export default {
             let config = {}
             let config = {}
             if (fieldKey === 'buyer') {
             if (fieldKey === 'buyer') {
                 config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
                 config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
+            } else if (fieldKey === 'stockUpCompanyId') {
+                config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
             }
             }
             const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
             const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
             this.sheet.visible = false
             this.sheet.visible = false
@@ -478,7 +534,17 @@ export default {
             const _fieldKey = this.relate.fieldKey
             const _fieldKey = this.relate.fieldKey
             const first = (items && items.length > 0) ? items[0] : null
             const first = (items && items.length > 0) ? items[0] : null
             this.form[_fieldKey] = (first && first.id) ? first.id : ''
             this.form[_fieldKey] = (first && first.id) ? first.id : ''
-            this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : ''
+
+            if (_fieldKey === 'stockUpCompanyId') {
+                 this.form.stockUpCompanyName = (first && first.name) ? first.name : ''
+            } else {
+                 this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : ''
+            }
+            
+            if (_fieldKey === 'buyer') {
+                this.form.stockUpCompanyId = (first && first.id) ? first.id : ''
+                this.form.stockUpCompanyName = (first && first.name) ? first.name : ''
+            }
         },
         },
         onRadioSelect(field, nameField, opt) {
         onRadioSelect(field, nameField, opt) {
             const val = opt && opt.value != null ? opt.value : ''
             const val = opt && opt.value != null ? opt.value : ''
@@ -534,9 +600,11 @@ export default {
                 { key: 'code', label: '编号' },
                 { key: 'code', label: '编号' },
                 { key: 'supplier', label: '供方' },
                 { key: 'supplier', label: '供方' },
                 { key: 'buyer', label: '需方' },
                 { key: 'buyer', label: '需方' },
+                { key: 'stockUpCompanyId', label: '备货单位/人（生产标准）' },
                 { key: 'orderDate', label: '订货日期' },
                 { key: 'orderDate', label: '订货日期' },
                 { key: 'unit', label: '单位' },
                 { key: 'unit', label: '单位' },
                 { key: 'workshopId', label: '生产厂' },
                 { key: 'workshopId', label: '生产厂' },
+                { key: 'region', label: '区域' },
                 { key: 'specialTerms', label: '特别条款要求' },
                 { key: 'specialTerms', label: '特别条款要求' },
             ]
             ]
             for (const it of checks) {
             for (const it of checks) {
@@ -544,6 +612,7 @@ export default {
                 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
                 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
                 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
                 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
             }
             }
+            if (this.$refs.productRel && !this.$refs.productRel.validate()) return false
             const list = Array.isArray(this.productLineList) ? this.productLineList : []
             const list = Array.isArray(this.productLineList) ? this.productLineList : []
             if (list.length === 0) {
             if (list.length === 0) {
                 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false
                 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false

@@ -15,11 +15,17 @@
                     }}</text></view>
                     }}</text></view>
                     <view class="row"><text class="label">需方</text><text class="value">{{ detail.buyerName || '-'
                     <view class="row"><text class="label">需方</text><text class="value">{{ detail.buyerName || '-'
                     }}</text></view>
                     }}</text></view>
+                    <view class="row"><text class="label">备货单位/人（生产标准）</text><text class="value">{{ detail.stockUpCompanyName || '-'
+                    }}</text></view>
                     <view class="row"><text class="label">订货日期</text><text class="value">{{ detail.orderDate }}</text>
                     <view class="row"><text class="label">订货日期</text><text class="value">{{ detail.orderDate }}</text>
                     </view>
                     </view>
                     <view class="row"><text class="label">单位</text><text class="value">{{ detail.unit }}</text></view>
                     <view class="row"><text class="label">单位</text><text class="value">{{ detail.unit }}</text></view>
                     <view class="row"><text class="label">生产厂</text><text class="value">{{ detail.workshopName || '-'
                     <view class="row"><text class="label">生产厂</text><text class="value">{{ detail.workshopName || '-'
                     }}</text></view>
                     }}</text></view>
+                    <view class="row"><text class="label">办事处</text><text class="value">{{ detail.deptName || '-'
+                    }}</text></view>
+                    <view class="row"><text class="label">区域</text><text class="value">{{ detail.regionName || '-'
+                    }}</text></view>
                 </view>
                 </view>
 
 
                 <view class="section1">
                 <view class="section1">
@@ -147,10 +153,15 @@ export default {
                 supplierName: '',
                 supplierName: '',
                 buyer: '',
                 buyer: '',
                 buyerName: '',
                 buyerName: '',
+                stockUpCompanyId: '',
+                stockUpCompanyName: '',
                 orderDate: '',
                 orderDate: '',
                 unit: '',
                 unit: '',
                 workshopId: '',
                 workshopId: '',
                 workshopName: '',
                 workshopName: '',
+                deptName: '',
+                region: '',
+                regionName: '',
                 designatedConsignee: '',
                 designatedConsignee: '',
                 specialTerms: '',
                 specialTerms: '',
                 specialTermsName: '',
                 specialTermsName: '',
@@ -466,6 +477,9 @@ export default {
                 this.detail = {
                 this.detail = {
                     ...this.detail,
                     ...this.detail,
                     ...data,
                     ...data,
+                    stockUpCompanyName: data.stockUpCompanyName || '',
+                    regionName: data.regionName || '',
+                    deptName: data.deptName || '',
                     includesPackagingFeeName, includesTransportFeeName,
                     includesPackagingFeeName, includesTransportFeeName,
                     destinationId: data.provinceId && data.cityId && data.districtId ? [data.provinceId, data.cityId, data.districtId] : '',
                     destinationId: data.provinceId && data.cityId && data.districtId ? [data.provinceId, data.cityId, data.districtId] : '',
                     destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '',
                     destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '',

@@ -22,12 +22,35 @@
                     </template>
                     </template>
                 </uni-list-item>
                 </uni-list-item>
 
 
+                <uni-list-item class="select-item" :class="form.stockUpCompanyId ? 'is-filled' : 'is-empty'" clickable
+                    @click="openRelate('stockUpCompanyId')" :rightText="form.stockUpCompanyName || '请选择备货单位'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text class="required">*</text><text>备货单位/人（生产标准）</text></view>
+                    </template>
+                </uni-list-item>
+
                 <uni-list-item class="select-item" :class="form.workshopId ? 'is-filled' : 'is-empty'" clickable
                 <uni-list-item class="select-item" :class="form.workshopId ? 'is-filled' : 'is-empty'" clickable
                     @click="openSheet('workshopId')" :rightText="form.workshopName || '请选择生产厂'" showArrow>
                     @click="openSheet('workshopId')" :rightText="form.workshopName || '请选择生产厂'" showArrow>
                     <template v-slot:body>
                     <template v-slot:body>
                         <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>
+                <uni-list-item class="select-item" :class="form.deptName ? 'is-filled' : 'is-empty'">
+                <template v-slot:body>
+                    <view class="item-title"><text class="required">*</text><text>办事处</text></view>
+                </template>
+                <template v-slot:footer>
+                    <view class="serial-number-row">
+                    <uni-easyinput v-model="form.deptName" :inputBorder="false" disabled />
+                    </view>
+                </template>
+                </uni-list-item>
+                <uni-list-item class="select-item" :class="form.region ? 'is-filled' : 'is-empty'" clickable
+                @click="openSheet('region')" :rightText="displayLabel('regionName')" showArrow>
+                <template v-slot:body>
+                    <view class="item-title"><text class="required">*</text><text>区域</text></view>
+                </template>
+                </uni-list-item>
 
 
                 <uni-list-item title="订货日期">
                 <uni-list-item title="订货日期">
                     <template v-slot:footer>
                     <template v-slot:footer>
@@ -41,7 +64,8 @@
                     </template>
                     </template>
                 </uni-list-item>
                 </uni-list-item>
 
 
-                <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>
@@ -198,6 +222,8 @@ import { getContractApi, updateContractApi } from '@/api/contract'
 import { getDicByCodes } from '@/utils/dic'
 import { getDicByCodes } from '@/utils/dic'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { workshopQueryApi } from '@/api/devManage'
 import { workshopQueryApi } from '@/api/devManage'
+import { getArea } from '@/api/credit_manage.js'
+
 export default {
 export default {
     name: 'ModifyContractForeignStock',
     name: 'ModifyContractForeignStock',
     components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector },
     components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector },
@@ -211,8 +237,14 @@ export default {
                 supplierName: '',
                 supplierName: '',
                 buyer: '',
                 buyer: '',
                 buyerName: '',
                 buyerName: '',
+                stockUpCompanyId: '',
+                stockUpCompanyName: '',
                 workshopId: '',
                 workshopId: '',
                 workshopName: '',
                 workshopName: '',
+                region: '',
+                regionName: '',
+                deptName: '',
+                deptId: '',
                 orderDate: '',
                 orderDate: '',
                 deliveryDate: '',
                 deliveryDate: '',
                 designatedConsignee: '',
                 designatedConsignee: '',
@@ -253,7 +285,8 @@ export default {
             totalAmountIncludingTax: 0,
             totalAmountIncludingTax: 0,
             productLineList: [],
             productLineList: [],
             newProductLineList: [],
             newProductLineList: [],
-            productList: []
+            productList: [],
+            regionOptions: []
         }
         }
     },
     },
     onLoad(query) {
     onLoad(query) {
@@ -262,6 +295,7 @@ export default {
     created() {
     created() {
         this.loadSuppliers()
         this.loadSuppliers()
         this.loadExtraOptions()
         this.loadExtraOptions()
+        this.loadRegionOptions()
         this.loadDetail()
         this.loadDetail()
         this.$nextTick(() => {
         this.$nextTick(() => {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
@@ -270,6 +304,15 @@ export default {
         })
         })
     },
     },
     methods: {
     methods: {
+        async loadRegionOptions() {
+            try {
+                const res = await getArea()
+                const list = res.data || []
+                this.regionOptions = (list || []).map(it => ({ label: it.name || '', value: it.id || '' }))
+            } catch (e) {
+                this.regionOptions = []
+            }
+        },
         async loadDetail() {
         async loadDetail() {
             if (!this.id) return
             if (!this.id) return
             try {
             try {
@@ -286,6 +329,8 @@ export default {
                     supplierName: m.supplierName || '',
                     supplierName: m.supplierName || '',
                     buyer: m.buyer || (m.customer && m.customer.id) || '',
                     buyer: m.buyer || (m.customer && m.customer.id) || '',
                     buyerName: m.buyerName || (m.customer && m.customer.name) || '',
                     buyerName: m.buyerName || (m.customer && m.customer.name) || '',
+                    stockUpCompanyId: m.stockUpCompanyId || '',
+                    stockUpCompanyName: m.stockUpCompanyName || '',
                     orderDate: m.orderDate || '',
                     orderDate: m.orderDate || '',
                     designatedConsignee: m.designatedConsignee || '',
                     designatedConsignee: m.designatedConsignee || '',
                     specialTerms: m.specialTerms || '',
                     specialTerms: m.specialTerms || '',
@@ -315,6 +360,10 @@ export default {
                     packaging: m.packaging || '',
                     packaging: m.packaging || '',
                     workshopId: m.workshopId || '',
                     workshopId: m.workshopId || '',
                     workshopName: m.workshopName || '',
                     workshopName: m.workshopName || '',
+                    region: m.region || '',
+                    regionName: m.regionName || '',
+                    deptName: m.deptName || '',
+                    deptId: m.deptId || '',
                 }
                 }
                 const lines = Array.isArray(m.contractDistributorLineList) ? m.contractDistributorLineList : []
                 const lines = Array.isArray(m.contractDistributorLineList) ? m.contractDistributorLineList : []
                 this.productLineList = lines
                 this.productLineList = lines
@@ -370,7 +419,7 @@ export default {
         },
         },
         displayLabel(field) {
         displayLabel(field) {
             const m = this.form
             const m = this.form
-            const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopName: '请选择生产厂' }
+            const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopName: '请选择生产厂', regionName: '请选择区域' }
             const val = m[field]
             const val = m[field]
             return val ? String(val) : map[field]
             return val ? String(val) : map[field]
         },
         },
@@ -399,6 +448,8 @@ export default {
                 setSheet('单价中是否已包含包装费', this.yesNoList)
                 setSheet('单价中是否已包含包装费', this.yesNoList)
             } else if (field === 'includesTransportFee') {
             } else if (field === 'includesTransportFee') {
                 setSheet('单价中是否已包含运费', this.yesNoList)
                 setSheet('单价中是否已包含运费', this.yesNoList)
+            } else if (field === 'region') {
+                setSheet('区域', this.regionOptions)
             }
             }
         },
         },
         onSheetConfirm({ value, label }) {
         onSheetConfirm({ value, label }) {
@@ -412,6 +463,8 @@ export default {
             let config = {}
             let config = {}
             if (fieldKey === 'buyer') {
             if (fieldKey === 'buyer') {
                 config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
                 config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
+            } else if (fieldKey === 'stockUpCompanyId') {
+                config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
             }
             }
             const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
             const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
             this.sheet.visible = false
             this.sheet.visible = false
@@ -422,7 +475,12 @@ export default {
             const _fieldKey = this.relate.fieldKey
             const _fieldKey = this.relate.fieldKey
             const first = (items && items.length > 0) ? items[0] : null
             const first = (items && items.length > 0) ? items[0] : null
             this.form[_fieldKey] = (first && first.id) ? first.id : ''
             this.form[_fieldKey] = (first && first.id) ? first.id : ''
-            this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : ''
+
+            if (_fieldKey === 'stockUpCompanyId') {
+                 this.form.stockUpCompanyName = (first && first.name) ? first.name : ''
+            } else {
+                 this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : ''
+            }
         },
         },
         onRadioSelect(field, nameField, opt) {
         onRadioSelect(field, nameField, opt) {
             const val = opt && opt.value != null ? opt.value : ''
             const val = opt && opt.value != null ? opt.value : ''
@@ -438,9 +496,11 @@ export default {
                 { key: 'code', label: '编号' },
                 { key: 'code', label: '编号' },
                 { key: 'supplier', label: '供方' },
                 { key: 'supplier', label: '供方' },
                 { key: 'buyer', label: '需方' },
                 { key: 'buyer', label: '需方' },
+                { key: 'stockUpCompanyId', label: '备货单位/人（生产标准）' },
                 { key: 'orderDate', label: '订货日期' },
                 { key: 'orderDate', label: '订货日期' },
                 { key: 'unit', label: '单位' },
                 { key: 'unit', label: '单位' },
                 { key: 'workshopId', label: '生产厂' },
                 { key: 'workshopId', label: '生产厂' },
+                { key: 'region', label: '区域' },
                 { key: 'specialTerms', label: '特别条款要求' },
                 { key: 'specialTerms', label: '特别条款要求' },
             ]
             ]
             for (const it of checks) {
             for (const it of checks) {
@@ -448,6 +508,7 @@ export default {
                 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
                 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
                 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
                 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
             }
             }
+            if (this.$refs.productRel && !this.$refs.productRel.validate()) return false
             const list = Array.isArray(this.newProductLineList) ? this.newProductLineList : []
             const list = Array.isArray(this.newProductLineList) ? this.newProductLineList : []
             if (list.length === 0) {
             if (list.length === 0) {
                 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false
                 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false

@@ -55,51 +55,53 @@
                     </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.thickness" :inputBorder="false" placeholder="请输入厚度" @input="onNonNegativeInput(idx, 'thickness')" @blur="onNonNegativeBlur(idx, 'thickness', 2)" />
+                            <uni-easyinput type="digit" v-model="item.thickness" :inputBorder="false" placeholder="请输入厚度" @input="onNonNegativeInput(idx, 'thickness')" @blur="onNonNegativeBlur(idx, 'thickness', 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.thicknessTolPos" :inputBorder="false"
-                                placeholder="请输入厚度公差上限" @input="onNonNegativeInput(idx, 'thicknessTolPos')" @blur="onNonNegativeBlur(idx, 'thicknessTolPos', 2)" />
+                            <uni-easyinput type="text" v-model="item.thicknessTolPos" :inputBorder="false"
+                                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"
-                                placeholder="请输入厚度公差下限" @input="onNonNegativeInput(idx, 'thicknessTolNeg')" @blur="onNonNegativeBlur(idx, 'thicknessTolNeg', 2)" />
+                            <uni-easyinput type="text" v-model="item.thicknessTolNeg" :inputBorder="false"
+                                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)">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput type="digit" v-model="item.width" :inputBorder="false" placeholder="请输入宽度" @input="onNonNegativeInput(idx, 'width')" @blur="onNonNegativeBlur(idx, 'width', 2)" />
+                            <uni-easyinput type="digit" v-model="item.width" :inputBorder="false" placeholder="请输入宽度" @input="onNonNegativeInput(idx, 'width')" @blur="onNonNegativeBlur(idx, 'width', 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.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差(单项+)" @input="onNonNegativeInput(idx, 'widthTolPos')" @blur="onNonNegativeBlur(idx, 'widthTolPos', 2)" />
+                            <uni-easyinput type="text" 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', 2)" />
+                            <uni-easyinput type="text" 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)">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput type="digit" v-model="item.length" :inputBorder="false" placeholder="请输入长度" @input="onNonNegativeInput(idx, 'length')" @blur="onNonNegativeBlur(idx, 'length', 2)" />
+                            <uni-easyinput type="digit" v-model="item.length" :inputBorder="false" placeholder="请输入长度" @input="onNonNegativeInput(idx, 'length')" @blur="onNonNegativeBlur(idx, 'length', 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.lengthTolPos" :inputBorder="false"
-                                placeholder="请输入长度公差上限" @input="onNonNegativeInput(idx, 'lengthTolPos')" @blur="onNonNegativeBlur(idx, 'lengthTolPos', 2)" />
+                            <uni-easyinput type="text" v-model="item.lengthTolPos" :inputBorder="false"
+                                placeholder="请输入长度公差上限" @input="onNumberInput(idx, 'lengthTolPos')" @blur="onNumberBlur(idx, 'lengthTolPos', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="长度公差下限(mm)">
                     <uni-list-item title="长度公差下限(mm)">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false"
-                                placeholder="请输入长度公差下限" @input="onNonNegativeInput(idx, 'lengthTolNeg')" @blur="onNonNegativeBlur(idx, 'lengthTolNeg', 2)" />
+                            <uni-easyinput type="text" v-model="item.lengthTolNeg" :inputBorder="false"
+                                placeholder="请输入长度公差下限" @input="onNumberInput(idx, 'lengthTolNeg')" @blur="onNumberBlur(idx, 'lengthTolNeg', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="状态">
                     <uni-list-item title="状态">
@@ -109,12 +111,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.quantity" type="digit" :inputBorder="false" placeholder="请输入数量" @input="onNonNegativeInput(idx, 'quantity')" @blur="onNonNegativeBlur(idx, 'quantity', 2)" />
+                            <uni-easyinput v-model="item.quantity" type="digit" :inputBorder="false" placeholder="请输入数量" @input="onNonNegativeInput(idx, 'quantity')" @blur="onNonNegativeBlur(idx, 'quantity', 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.unitPrice" disabled type="number" :inputBorder="false" placeholder="请输入单价" @input="onImmediateChange(idx)" @blur="onNumberBlur(idx, 'unitPrice', 0)" />
+                            <uni-easyinput v-model="item.unitPrice" disabled type="number" :inputBorder="false" placeholder="请输入单价" @input="onImmediateChange(idx)" @blur="onNumberBlur(idx, 'unitPrice', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="外贸加工费">
                     <uni-list-item title="外贸加工费">
@@ -305,6 +307,27 @@ export default {
             this.$set(this.items, idx, it)
             this.$set(this.items, idx, it)
             if (field === 'quantity' || field === 'unitPrice') this.recalculate(idx)
             if (field === 'quantity' || field === 'unitPrice') this.recalculate(idx)
         },
         },
+        validate() {
+            for (let i = 0; i < this.items.length; i++) {
+                const it = this.items[i]
+                const check = (pos, neg, label) => {
+                    if (pos !== '' && pos !== null && pos !== undefined &&
+                        neg !== '' && neg !== null && neg !== undefined) {
+                        if (Number(pos) <= Number(neg)) {
+                            return `第${i + 1}行产品：${label}公差上限必须大于下限`
+                        }
+                    }
+                    return null
+                }
+                let err = check(it.thicknessTolPos, it.thicknessTolNeg, '厚度')
+                if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
+                err = check(it.widthTolPos, it.widthTolNeg, '宽度')
+                if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
+                err = check(it.lengthTolPos, it.lengthTolNeg, '长度')
+                if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
+            }
+            return true
+        },
         formatCurrency(val) {
         formatCurrency(val) {
             if (val == null || val === '') return ''
             if (val == null || val === '') return ''
             const num = Number(val)
             const num = Number(val)

@@ -21,6 +21,12 @@
                         <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>
+                <uni-list-item class="select-item" :class="form.stockUpCompanyId ? 'is-filled' : 'is-empty'" clickable
+                    @click="openRelate('stockUpCompanyId')" :rightText="form.stockUpCompanyName || '请选择备货单位'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text class="required">*</text><text>备货单位/人（生产标准）</text></view>
+                    </template>
+                </uni-list-item>
 
 
                 <uni-list-item title="订货日期">
                 <uni-list-item title="订货日期">
                     <template v-slot:footer>
                     <template v-slot:footer>
@@ -39,7 +45,23 @@
 						<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 mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" @change="onProductsChange" :options="productList" />
+                <uni-list-item class="select-item" :class="form.deptName ? 'is-filled' : 'is-empty'">
+                <template v-slot:body>
+                    <view class="item-title"><text class="required">*</text><text>办事处</text></view>
+                </template>
+                <template v-slot:footer>
+                    <view class="serial-number-row">
+                    <uni-easyinput v-model="form.deptName" :inputBorder="false" disabled />
+                    </view>
+                </template>
+                </uni-list-item>
+                <uni-list-item class="select-item" :class="form.region ? 'is-filled' : 'is-empty'" clickable
+                @click="openSheet('region')" :rightText="displayLabel('regionName')" showArrow>
+                <template v-slot:body>
+                    <view class="item-title"><text class="required">*</text><text>区域</text></view>
+                </template>
+                </uni-list-item>
+                <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 />
@@ -208,10 +230,11 @@ import SingleSelectSheet from '@/components/single-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
 import ProductRel from './productRel.vue'
 import ProductRel from './productRel.vue'
 import CitySelector from '@/components/city-selector/index.vue'
 import CitySelector from '@/components/city-selector/index.vue'
-import { getRetailCodeApi, createContractApi, getCustomerRemarks,getCustomerSpecificQualityRequirements } from '@/api/contract'
+import { getRetailCodeApi, createContractApi, getCustomerRemarks,getCustomerSpecificQualityRequirements, getDeptApi } from '@/api/contract'
 import { getDicByCodes } from '@/utils/dic'
 import { getDicByCodes } from '@/utils/dic'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { workshopQueryApi } from '@/api/devManage'
 import { workshopQueryApi } from '@/api/devManage'
+import { getArea } from '@/api/credit_manage.js'
 
 
 export default {
 export default {
     name: 'AddContractForeignUnplan',
     name: 'AddContractForeignUnplan',
@@ -224,6 +247,8 @@ export default {
                 supplierName: '',
                 supplierName: '',
                 buyer: '',
                 buyer: '',
                 buyerName: '',
                 buyerName: '',
+                stockUpCompanyId: '',
+                stockUpCompanyName: '',
                 orderDate: '',
                 orderDate: '',
                 deliveryDate: '',
                 deliveryDate: '',
                 designatedConsignee: '',
                 designatedConsignee: '',
@@ -242,6 +267,10 @@ export default {
                 destinationLabel: '',
                 destinationLabel: '',
                 workshopIdName: '',
                 workshopIdName: '',
                 workshopId: '',
                 workshopId: '',
+                deptName: '',
+                deptId: '',
+                region: '',
+                regionName: '',
                 remarks: '',
                 remarks: '',
                 component: '',
                 component: '',
                 packaging: '',
                 packaging: '',
@@ -263,12 +292,15 @@ export default {
             productList: [],
             productList: [],
             customerRemarks: [],
             customerRemarks: [],
             defaultRemark: '',
             defaultRemark: '',
+            regionOptions: [],
         }
         }
     },
     },
     created() {
     created() {
         this.loadSuppliers()
         this.loadSuppliers()
         this.loadExtraOptions()
         this.loadExtraOptions()
         this.initCode()
         this.initCode()
+        this.getDept()
+        this.loadRegionOptions()
         this.form.orderDate = this.formatDate(new Date())
         this.form.orderDate = this.formatDate(new Date())
         this.$nextTick(() => {
         this.$nextTick(() => {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
@@ -317,6 +349,24 @@ export default {
         },
         },
     },
     },
     methods: {
     methods: {
+        async loadRegionOptions() {
+            try {
+                const res = await getArea()
+                const list = res.data || []
+                this.regionOptions = (list || []).map(it => ({ label: it.name || '', value: it.id || '' }))
+            } catch (e) {
+                this.regionOptions = []
+            }
+        },
+        // 查询当前人所在办事处
+        getDept() {
+            getDeptApi().then(res => {
+                if (res.code === 200) {
+                    this.form.deptName = res.data.name || ''
+                    this.form.deptId = res.data.id || ''
+                }
+            })
+        },
         getHistory() {
         getHistory() {
             console.log('this.productLineList', this.productLineList[0].productId)
             console.log('this.productLineList', this.productLineList[0].productId)
             if (!this.productLineList.length || !this.productLineList[0].productId) {
             if (!this.productLineList.length || !this.productLineList[0].productId) {
@@ -404,7 +454,7 @@ export default {
         },
         },
         displayLabel(field) {
         displayLabel(field) {
             const m = this.form
             const m = this.form
-            const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopIdName: '请选择生产厂' }
+            const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopIdName: '请选择生产厂', regionName: '请选择区域' }
             const val = m[field]
             const val = m[field]
             return val ? String(val) : map[field]
             return val ? String(val) : map[field]
         },
         },
@@ -449,6 +499,8 @@ export default {
                 setSheet('单价中是否已包含运费', this.yesNoList)
                 setSheet('单价中是否已包含运费', this.yesNoList)
             } else if (field === 'historyRemarks') {
             } else if (field === 'historyRemarks') {
                 setSheet('历史备注', this.customerRemarks)
                 setSheet('历史备注', this.customerRemarks)
+            }else if (field === 'region') {
+                setSheet('区域', this.regionOptions)
             }
             }
         },
         },
         onSheetConfirm({ value, label }) {
         onSheetConfirm({ value, label }) {
@@ -467,6 +519,8 @@ export default {
             let config = {}
             let config = {}
             if (fieldKey === 'buyer') {
             if (fieldKey === 'buyer') {
                 config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
                 config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
+            } else if (fieldKey === 'stockUpCompanyId') {
+                config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
             }
             }
             const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
             const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
             this.sheet.visible = false
             this.sheet.visible = false
@@ -477,7 +531,17 @@ export default {
             const _fieldKey = this.relate.fieldKey
             const _fieldKey = this.relate.fieldKey
             const first = (items && items.length > 0) ? items[0] : null
             const first = (items && items.length > 0) ? items[0] : null
             this.form[_fieldKey] = (first && first.id) ? first.id : ''
             this.form[_fieldKey] = (first && first.id) ? first.id : ''
-            this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : ''
+
+            if (_fieldKey === 'stockUpCompanyId') {
+                 this.form.stockUpCompanyName = (first && first.name) ? first.name : ''
+            } else {
+                 this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : ''
+            }
+            
+            if (_fieldKey === 'buyer') {
+                this.form.stockUpCompanyId = (first && first.id) ? first.id : ''
+                this.form.stockUpCompanyName = (first && first.name) ? first.name : ''
+            }
         },
         },
         onRadioSelect(field, nameField, opt) {
         onRadioSelect(field, nameField, opt) {
             const val = opt && opt.value != null ? opt.value : ''
             const val = opt && opt.value != null ? opt.value : ''
@@ -489,6 +553,7 @@ export default {
             }
             }
         },
         },
         async onSubmit() {
         async onSubmit() {
+            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 })
@@ -533,9 +598,11 @@ export default {
                 { key: 'code', label: '编号' },
                 { key: 'code', label: '编号' },
                 { key: 'supplier', label: '供方' },
                 { key: 'supplier', label: '供方' },
                 { key: 'buyer', label: '需方' },
                 { key: 'buyer', label: '需方' },
+                { key: 'stockUpCompanyId', label: '备货单位/人（生产标准）' },
                 { key: 'orderDate', label: '订货日期' },
                 { key: 'orderDate', label: '订货日期' },
                 { key: 'unit', label: '单位' },
                 { key: 'unit', label: '单位' },
                 { key: 'workshopId', label: '生产厂' },
                 { key: 'workshopId', label: '生产厂' },
+                { key: 'region', label: '区域' },
                 { key: 'specialTerms', label: '特别条款要求' },
                 { key: 'specialTerms', label: '特别条款要求' },
             ]
             ]
             for (const it of checks) {
             for (const it of checks) {

@@ -17,11 +17,17 @@
                     }}</text></view>
                     }}</text></view>
                     <view class="row"><text class="label">需方</text><text class="value">{{ detail.buyerName || '-'
                     <view class="row"><text class="label">需方</text><text class="value">{{ detail.buyerName || '-'
                     }}</text></view>
                     }}</text></view>
+                    <view class="row"><text class="label">备货单位/人（生产标准）</text><text class="value">{{ detail.stockUpCompanyName || '-'
+                    }}</text></view>
                     <view class="row"><text class="label">订货日期</text><text class="value">{{ detail.orderDate }}</text>
                     <view class="row"><text class="label">订货日期</text><text class="value">{{ detail.orderDate }}</text>
                     </view>
                     </view>
                     <view class="row"><text class="label">单位</text><text class="value">{{ detail.unit }}</text></view>
                     <view class="row"><text class="label">单位</text><text class="value">{{ detail.unit }}</text></view>
                     <view class="row"><text class="label">生产厂</text><text class="value">{{ detail.workshopName || '-'
                     <view class="row"><text class="label">生产厂</text><text class="value">{{ detail.workshopName || '-'
                     }}</text></view>
                     }}</text></view>
+                    <view class="row"><text class="label">办事处</text><text class="value">{{ detail.deptName || '-'
+                    }}</text></view>
+                    <view class="row"><text class="label">区域</text><text class="value">{{ detail.regionName || '-'
+                    }}</text></view>
                 </view>
                 </view>
 
 
                 <view class="section1">
                 <view class="section1">
@@ -148,10 +154,15 @@ export default {
                 supplierName: '',
                 supplierName: '',
                 buyer: '',
                 buyer: '',
                 buyerName: '',
                 buyerName: '',
+                stockUpCompanyId: '',
+                stockUpCompanyName: '',
                 orderDate: '',
                 orderDate: '',
                 unit: '',
                 unit: '',
                 workshopId: '',
                 workshopId: '',
                 workshopName: '',
                 workshopName: '',
+                deptName: '',
+                region: '',
+                regionName: '',
                 designatedConsignee: '',
                 designatedConsignee: '',
                 specialTerms: '',
                 specialTerms: '',
                 specialTermsName: '',
                 specialTermsName: '',
@@ -480,6 +491,9 @@ export default {
                 this.detail = {
                 this.detail = {
                     ...this.detail,
                     ...this.detail,
                     ...data,
                     ...data,
+                    stockUpCompanyName: data.stockUpCompanyName || '',
+                    regionName: data.regionName || '',
+                    deptName: data.deptName || '',
                     includesPackagingFeeName, includesTransportFeeName,
                     includesPackagingFeeName, includesTransportFeeName,
                     destinationId: data.provinceId && data.cityId && data.districtId ? [data.provinceId, data.cityId, data.districtId] : '',
                     destinationId: data.provinceId && data.cityId && data.districtId ? [data.provinceId, data.cityId, data.districtId] : '',
                     destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '',
                     destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '',

@@ -22,12 +22,35 @@
                     </template>
                     </template>
                 </uni-list-item>
                 </uni-list-item>
 
 
+                <uni-list-item class="select-item" :class="form.stockUpCompanyId ? 'is-filled' : 'is-empty'" clickable
+                    @click="openRelate('stockUpCompanyId')" :rightText="form.stockUpCompanyName || '请选择备货单位'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text class="required">*</text><text>备货单位/人（生产标准）</text></view>
+                    </template>
+                </uni-list-item>
+
                 <uni-list-item class="select-item" :class="form.workshopId ? 'is-filled' : 'is-empty'" clickable
                 <uni-list-item class="select-item" :class="form.workshopId ? 'is-filled' : 'is-empty'" clickable
                     @click="openSheet('workshopId')" :rightText="form.workshopName || '请选择生产厂'" showArrow>
                     @click="openSheet('workshopId')" :rightText="form.workshopName || '请选择生产厂'" showArrow>
                     <template v-slot:body>
                     <template v-slot:body>
                         <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>
+                <uni-list-item class="select-item" :class="form.deptName ? 'is-filled' : 'is-empty'">
+                <template v-slot:body>
+                    <view class="item-title"><text class="required">*</text><text>办事处</text></view>
+                </template>
+                <template v-slot:footer>
+                    <view class="serial-number-row">
+                    <uni-easyinput v-model="form.deptName" :inputBorder="false" disabled />
+                    </view>
+                </template>
+                </uni-list-item>
+                <uni-list-item class="select-item" :class="form.region ? 'is-filled' : 'is-empty'" clickable
+                @click="openSheet('region')" :rightText="displayLabel('regionName')" showArrow>
+                <template v-slot:body>
+                    <view class="item-title"><text class="required">*</text><text>区域</text></view>
+                </template>
+                </uni-list-item>
 
 
                 <uni-list-item title="订货日期">
                 <uni-list-item title="订货日期">
                     <template v-slot:footer>
                     <template v-slot:footer>
@@ -41,7 +64,7 @@
                     </template>
                     </template>
                 </uni-list-item>
                 </uni-list-item>
 
 
-                <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>
@@ -198,6 +221,8 @@ import { getContractApi, updateContractApi } from '@/api/contract'
 import { getDicByCodes } from '@/utils/dic'
 import { getDicByCodes } from '@/utils/dic'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { workshopQueryApi } from '@/api/devManage'
 import { workshopQueryApi } from '@/api/devManage'
+import { getArea } from '@/api/credit_manage.js'
+
 export default {
 export default {
     name: 'ModifyContractForeignUnplan',
     name: 'ModifyContractForeignUnplan',
     components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector },
     components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector },
@@ -211,8 +236,14 @@ export default {
                 supplierName: '',
                 supplierName: '',
                 buyer: '',
                 buyer: '',
                 buyerName: '',
                 buyerName: '',
+                stockUpCompanyId: '',
+                stockUpCompanyName: '',
                 workshopId: '',
                 workshopId: '',
                 workshopName: '',
                 workshopName: '',
+                region: '',
+                regionName: '',
+                deptName: '',
+                deptId: '',
                 orderDate: '',
                 orderDate: '',
                 deliveryDate: '',
                 deliveryDate: '',
                 designatedConsignee: '',
                 designatedConsignee: '',
@@ -253,7 +284,8 @@ export default {
             totalAmountIncludingTax: 0,
             totalAmountIncludingTax: 0,
             productLineList: [],
             productLineList: [],
             newProductLineList: [],
             newProductLineList: [],
-            productList: []
+            productList: [],
+            regionOptions: []
         }
         }
     },
     },
     onLoad(query) {
     onLoad(query) {
@@ -262,6 +294,7 @@ export default {
     created() {
     created() {
         this.loadSuppliers()
         this.loadSuppliers()
         this.loadExtraOptions()
         this.loadExtraOptions()
+        this.loadRegionOptions()
         this.loadDetail()
         this.loadDetail()
         this.$nextTick(() => {
         this.$nextTick(() => {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
@@ -270,6 +303,15 @@ export default {
         })
         })
     },
     },
     methods: {
     methods: {
+        async loadRegionOptions() {
+            try {
+                const res = await getArea()
+                const list = res.data || []
+                this.regionOptions = (list || []).map(it => ({ label: it.name || '', value: it.id || '' }))
+            } catch (e) {
+                this.regionOptions = []
+            }
+        },
         async loadDetail() {
         async loadDetail() {
             if (!this.id) return
             if (!this.id) return
             try {
             try {
@@ -286,6 +328,8 @@ export default {
                     supplierName: m.supplierName || '',
                     supplierName: m.supplierName || '',
                     buyer: m.buyer || (m.customer && m.customer.id) || '',
                     buyer: m.buyer || (m.customer && m.customer.id) || '',
                     buyerName: m.buyerName || (m.customer && m.customer.name) || '',
                     buyerName: m.buyerName || (m.customer && m.customer.name) || '',
+                    stockUpCompanyId: m.stockUpCompanyId || '',
+                    stockUpCompanyName: m.stockUpCompanyName || '',
                     orderDate: m.orderDate || '',
                     orderDate: m.orderDate || '',
                     designatedConsignee: m.designatedConsignee || '',
                     designatedConsignee: m.designatedConsignee || '',
                     specialTerms: m.specialTerms || '',
                     specialTerms: m.specialTerms || '',
@@ -315,6 +359,10 @@ export default {
                     packaging: m.packaging || '',
                     packaging: m.packaging || '',
                     workshopId: m.workshopId || '',
                     workshopId: m.workshopId || '',
                     workshopName: m.workshopName || '',
                     workshopName: m.workshopName || '',
+                    region: m.region || '',
+                    regionName: m.regionName || '',
+                    deptName: m.deptName || '',
+                    deptId: m.deptId || '',
                 }
                 }
                 const lines = Array.isArray(m.contractDistributorLineList) ? m.contractDistributorLineList : []
                 const lines = Array.isArray(m.contractDistributorLineList) ? m.contractDistributorLineList : []
                 this.productLineList = lines
                 this.productLineList = lines
@@ -370,7 +418,7 @@ export default {
         },
         },
         displayLabel(field) {
         displayLabel(field) {
             const m = this.form
             const m = this.form
-            const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopName: '请选择生产厂' }
+            const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopName: '请选择生产厂', regionName: '请选择区域' }
             const val = m[field]
             const val = m[field]
             return val ? String(val) : map[field]
             return val ? String(val) : map[field]
         },
         },
@@ -399,6 +447,8 @@ export default {
                 setSheet('单价中是否已包含包装费', this.yesNoList)
                 setSheet('单价中是否已包含包装费', this.yesNoList)
             } else if (field === 'includesTransportFee') {
             } else if (field === 'includesTransportFee') {
                 setSheet('单价中是否已包含运费', this.yesNoList)
                 setSheet('单价中是否已包含运费', this.yesNoList)
+            } else if (field === 'region') {
+                setSheet('区域', this.regionOptions)
             }
             }
         },
         },
         onSheetConfirm({ value, label }) {
         onSheetConfirm({ value, label }) {
@@ -412,6 +462,8 @@ export default {
             let config = {}
             let config = {}
             if (fieldKey === 'buyer') {
             if (fieldKey === 'buyer') {
                 config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
                 config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
+            } else if (fieldKey === 'stockUpCompanyId') {
+                config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
             }
             }
             const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
             const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
             this.sheet.visible = false
             this.sheet.visible = false
@@ -422,7 +474,12 @@ export default {
             const _fieldKey = this.relate.fieldKey
             const _fieldKey = this.relate.fieldKey
             const first = (items && items.length > 0) ? items[0] : null
             const first = (items && items.length > 0) ? items[0] : null
             this.form[_fieldKey] = (first && first.id) ? first.id : ''
             this.form[_fieldKey] = (first && first.id) ? first.id : ''
-            this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : ''
+
+            if (_fieldKey === 'stockUpCompanyId') {
+                 this.form.stockUpCompanyName = (first && first.name) ? first.name : ''
+            } else {
+                 this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : ''
+            }
         },
         },
         onRadioSelect(field, nameField, opt) {
         onRadioSelect(field, nameField, opt) {
             const val = opt && opt.value != null ? opt.value : ''
             const val = opt && opt.value != null ? opt.value : ''
@@ -438,9 +495,11 @@ export default {
                 { key: 'code', label: '编号' },
                 { key: 'code', label: '编号' },
                 { key: 'supplier', label: '供方' },
                 { key: 'supplier', label: '供方' },
                 { key: 'buyer', label: '需方' },
                 { key: 'buyer', label: '需方' },
+                { key: 'stockUpCompanyId', label: '备货单位/人（生产标准）' },
                 { key: 'orderDate', label: '订货日期' },
                 { key: 'orderDate', label: '订货日期' },
                 { key: 'unit', label: '单位' },
                 { key: 'unit', label: '单位' },
                 { key: 'workshopId', label: '生产厂' },
                 { key: 'workshopId', label: '生产厂' },
+                { key: 'region', label: '区域' },
                 { key: 'specialTerms', label: '特别条款要求' },
                 { key: 'specialTerms', label: '特别条款要求' },
             ]
             ]
             for (const it of checks) {
             for (const it of checks) {
@@ -470,8 +529,8 @@ export default {
             return true
             return true
         },
         },
         async onSubmit() {
         async onSubmit() {
-            console.log('onSubmit__payload', payload)
             if (!this.validateRequired()) return
             if (!this.validateRequired()) 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 })
             })
             })

@@ -55,51 +55,51 @@
                     </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.thickness" :inputBorder="false" placeholder="请输入厚度" @input="onNonNegativeInput(idx, 'thickness')" @blur="onNonNegativeBlur(idx, 'thickness', 2)" />
+                            <uni-easyinput type="digit" v-model="item.thickness" :inputBorder="false" placeholder="请输入厚度" @input="onNonNegativeInput(idx, 'thickness')" @blur="onNonNegativeBlur(idx, 'thickness', 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.thicknessTolPos" :inputBorder="false"
                             <uni-easyinput type="digit" v-model="item.thicknessTolPos" :inputBorder="false"
-                                placeholder="请输入厚度公差上限" @input="onNonNegativeInput(idx, 'thicknessTolPos')" @blur="onNonNegativeBlur(idx, 'thicknessTolPos', 2)" />
+                                placeholder="请输入厚度公差上限" @input="onNonNegativeInput(idx, 'thicknessTolPos')" @blur="onNonNegativeBlur(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', 2)" />
+                                placeholder="请输入厚度公差下限" @input="onNonNegativeInput(idx, 'thicknessTolNeg')" @blur="onNonNegativeBlur(idx, 'thicknessTolNeg', 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.width" :inputBorder="false" placeholder="请输入宽度" @input="onNonNegativeInput(idx, 'width')" @blur="onNonNegativeBlur(idx, 'width', 2)" />
+                            <uni-easyinput type="digit" v-model="item.width" :inputBorder="false" placeholder="请输入宽度" @input="onNonNegativeInput(idx, 'width')" @blur="onNonNegativeBlur(idx, 'width', 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.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差上限" @input="onNonNegativeInput(idx, 'widthTolPos')" @blur="onNonNegativeBlur(idx, 'widthTolPos', 2)" />
+                            <uni-easyinput type="digit" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差上限" @input="onNonNegativeInput(idx, 'widthTolPos')" @blur="onNonNegativeBlur(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', 2)" />
+                            <uni-easyinput type="digit" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差下限" @input="onNonNegativeInput(idx, 'widthTolNeg')" @blur="onNonNegativeBlur(idx, 'widthTolNeg', 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.length" :inputBorder="false" placeholder="请输入长度" @input="onNonNegativeInput(idx, 'length')" @blur="onNonNegativeBlur(idx, 'length', 2)" />
+                            <uni-easyinput type="digit" v-model="item.length" :inputBorder="false" placeholder="请输入长度" @input="onNonNegativeInput(idx, 'length')" @blur="onNonNegativeBlur(idx, 'length', 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.lengthTolPos" :inputBorder="false"
                             <uni-easyinput type="digit" v-model="item.lengthTolPos" :inputBorder="false"
-                                placeholder="请输入长度公差上限" @input="onNonNegativeInput(idx, 'lengthTolPos')" @blur="onNonNegativeBlur(idx, 'lengthTolPos', 2)" />
+                                placeholder="请输入长度公差上限" @input="onNonNegativeInput(idx, 'lengthTolPos')" @blur="onNonNegativeBlur(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', 2)" />
+                                placeholder="请输入长度公差下限" @input="onNonNegativeInput(idx, 'lengthTolNeg')" @blur="onNonNegativeBlur(idx, 'lengthTolNeg', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="状态">
                     <uni-list-item title="状态">
@@ -109,12 +109,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.quantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'quantity')" @blur="onNonNegativeBlur(idx, 'quantity', 2)" />
+                            <uni-easyinput v-model="item.quantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'quantity')" @blur="onNonNegativeBlur(idx, 'quantity', 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.unitPrice" type="digit" :inputBorder="false" placeholder="请输入销售价格" @input="onNonNegativeInput(idx, 'unitPrice')" @blur="onNonNegativeBlur(idx, 'unitPrice', 2)" />
+                            <uni-easyinput v-model="item.unitPrice" type="digit" :inputBorder="false" placeholder="请输入销售价格" @input="onNonNegativeInput(idx, 'unitPrice')" @blur="onNonNegativeBlur(idx, 'unitPrice', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="外贸加工费">
                     <uni-list-item title="外贸加工费">
@@ -286,6 +286,73 @@ export default {
             const m = Math.pow(10, digits)
             const m = Math.pow(10, digits)
             return Math.round(n * m) / m
             return Math.round(n * m) / m
         },
         },
+        onNumberInput(idx, field) {
+            const it = this.items[idx]
+            if (!it) return
+            // 允许负号和小数点
+            let v = String(it[field] != null ? it[field] : '')
+            // 先只保留数字、小数点、负号
+            v = v.replace(/[^0-9.-]/g, '')
+            // 处理负号：只有第一个位置可以是负号，如果后面出现负号则移除
+            if (v.lastIndexOf('-') > 0) {
+                const hasMinusAtStart = v.startsWith('-')
+                v = v.replace(/-/g, '')
+                if (hasMinusAtStart) v = '-' + v
+            }
+            // 处理小数点：只保留第一个小数点
+            if ((v.match(/\./g) || []).length > 1) {
+                const firstDotIndex = v.indexOf('.')
+                v = v.substring(0, firstDotIndex + 1) + v.substring(firstDotIndex + 1).replace(/\./g, '')
+            }
+            // 处理特殊情况：.5 -> 0.5, -.5 -> -0.5
+            if (v.startsWith('.')) v = '0' + v
+            if (v.startsWith('-.')) v = '-0' + v.substring(1)
+
+            it[field] = v
+            this.$set(this.items, idx, it)
+        },
+        onNumberBlur(idx, field, digits = 2) {
+            const it = this.items[idx]
+            if (!it) return
+            let v = it[field]
+            if (v === '' || v === '-' || v === null || v === undefined) {
+                // 如果为空或只有一个负号，不处理或置空，看需求，这里保持原值或空
+            } else {
+                // 转为数字并保留小数位
+                const num = Number(v)
+                if (!isNaN(num)) {
+                    it[field] = this.round(num, digits)
+                } else {
+                    it[field] = ''
+                }
+            }
+            this.$set(this.items, idx, it)
+        },
+        validate() {
+            for (let i = 0; i < this.items.length; i++) {
+                const it = this.items[i]
+                const check = (pos, neg, label) => {
+                    // 只有当上限和下限都有值时才校验
+                    if (pos !== '' && pos !== null && pos !== undefined &&
+                        neg !== '' && neg !== null && neg !== undefined) {
+                        if (Number(pos) <= Number(neg)) {
+                            return `第${i + 1}行产品：${label}公差上限必须大于下限`
+                        }
+                    }
+                    return null
+                }
+                
+                let err = check(it.thicknessTolPos, it.thicknessTolNeg, '厚度')
+                if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
+                
+                err = check(it.widthTolPos, it.widthTolNeg, '宽度')
+                if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
+                
+                err = check(it.lengthTolPos, it.lengthTolNeg, '长度')
+                if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
+            }
+            return true
+        },
         onNonNegativeBlur(idx, field, digits) {
         onNonNegativeBlur(idx, field, digits) {
             const it = this.items[idx]
             const it = this.items[idx]
             if (!it) return
             if (!it) return

@@ -21,6 +21,12 @@
                         <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>
+                <uni-list-item class="select-item" :class="form.stockUpCompanyId ? 'is-filled' : 'is-empty'" clickable
+                    @click="openRelate('stockUpCompanyId')" :rightText="form.stockUpCompanyName || '请选择备货单位'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text class="required">*</text><text>备货单位/人（生产标准）</text></view>
+                    </template>
+                </uni-list-item>
 
 
                 <uni-list-item title="订货日期">
                 <uni-list-item title="订货日期">
                     <template v-slot:footer>
                     <template v-slot:footer>
@@ -39,7 +45,23 @@
 						<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 mode="add" :deliveryDateBase="form.deliveryDate" :deliveryDate="form.orderDate" @change="onProductsChange" :options="productList" :rawToProdRatioList="rawToProdRatioList" />
+                <uni-list-item class="select-item" :class="form.deptName ? 'is-filled' : 'is-empty'">
+                <template v-slot:body>
+                    <view class="item-title"><text class="required">*</text><text>办事处</text></view>
+                </template>
+                <template v-slot:footer>
+                    <view class="serial-number-row">
+                    <uni-easyinput v-model="form.deptName" :inputBorder="false" disabled />
+                    </view>
+                </template>
+                </uni-list-item>
+                <uni-list-item class="select-item" :class="form.region ? 'is-filled' : 'is-empty'" clickable
+                @click="openSheet('region')" :rightText="displayLabel('regionName')" showArrow>
+                <template v-slot:body>
+                    <view class="item-title"><text class="required">*</text><text>区域</text></view>
+                </template>
+                </uni-list-item>
+                <ProductRel ref="productRel" mode="add" :deliveryDateBase="form.deliveryDate" :deliveryDate="form.orderDate" @change="onProductsChange" :options="productList" :rawToProdRatioList="rawToProdRatioList" />
                 <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 />
@@ -208,10 +230,11 @@ import SingleSelectSheet from '@/components/single-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
 import ProductRel from './productRel.vue'
 import ProductRel from './productRel.vue'
 import CitySelector from '@/components/city-selector/index.vue'
 import CitySelector from '@/components/city-selector/index.vue'
-import { getRetailCodeApi, createContractApi, getCustomerRemarks,getCustomerSpecificQualityRequirements } from '@/api/contract'
+import { getRetailCodeApi, createContractApi, getCustomerRemarks,getCustomerSpecificQualityRequirements, getDeptApi } from '@/api/contract'
 import { getDicByCodes } from '@/utils/dic'
 import { getDicByCodes } from '@/utils/dic'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { workshopQueryApi } from '@/api/devManage'
 import { workshopQueryApi } from '@/api/devManage'
+import { getArea } from '@/api/credit_manage.js'
 
 
 export default {
 export default {
     name: 'AddContractProcess',
     name: 'AddContractProcess',
@@ -224,6 +247,8 @@ export default {
                 supplierName: '',
                 supplierName: '',
                 buyer: '',
                 buyer: '',
                 buyerName: '',
                 buyerName: '',
+                stockUpCompanyId: '',
+                stockUpCompanyName: '',
                 orderDate: '',
                 orderDate: '',
                 deliveryDate: '',
                 deliveryDate: '',
                 designatedConsignee: '',
                 designatedConsignee: '',
@@ -242,6 +267,10 @@ export default {
                 destinationLabel: '',
                 destinationLabel: '',
                 workshopIdName: '',
                 workshopIdName: '',
                 workshopId: '',
                 workshopId: '',
+                deptName: '',
+                deptId: '',
+                region: '',
+                regionName: '',
                 remarks: '',
                 remarks: '',
                 component: '',
                 component: '',
                 packaging: '',
                 packaging: '',
@@ -261,15 +290,18 @@ export default {
             totalAmountIncludingTax: 0,
             totalAmountIncludingTax: 0,
             productLineList: [],
             productLineList: [],
             productList: [],
             productList: [],
-            rawToProdRatioList: [],
             customerRemarks: [],
             customerRemarks: [],
             defaultRemark: '',
             defaultRemark: '',
+            regionOptions: [],
+            rawToProdRatioList: [],
         }
         }
     },
     },
     created() {
     created() {
         this.loadSuppliers()
         this.loadSuppliers()
         this.loadExtraOptions()
         this.loadExtraOptions()
         this.initCode()
         this.initCode()
+        this.getDept()
+        this.loadRegionOptions()
         this.form.orderDate = this.formatDate(new Date())
         this.form.orderDate = this.formatDate(new Date())
         this.$nextTick(() => {
         this.$nextTick(() => {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
@@ -318,6 +350,24 @@ export default {
         },
         },
     },
     },
     methods: {
     methods: {
+        async loadRegionOptions() {
+            try {
+                const res = await getArea()
+                const list = res.data || []
+                this.regionOptions = (list || []).map(it => ({ label: it.name || '', value: it.id || '' }))
+            } catch (e) {
+                this.regionOptions = []
+            }
+        },
+        // 查询当前人所在办事处
+        getDept() {
+            getDeptApi().then(res => {
+                if (res.code === 200) {
+                    this.form.deptName = res.data.name || ''
+                    this.form.deptId = res.data.id || ''
+                }
+            })
+        },
         getHistory() {
         getHistory() {
             console.log('this.productLineList', this.productLineList[0].rawProductId)
             console.log('this.productLineList', this.productLineList[0].rawProductId)
             if (!this.productLineList.length || !this.productLineList[0].rawProductId) {
             if (!this.productLineList.length || !this.productLineList[0].rawProductId) {
@@ -408,7 +458,7 @@ export default {
         },
         },
         displayLabel(field) {
         displayLabel(field) {
             const m = this.form
             const m = this.form
-            const map = { supplierName: '请选择承揽方', buyerName: '请选择定作方', workshopIdName: '请选择生产厂' }
+            const map = { supplierName: '请选择承揽方', buyerName: '请选择定作方', workshopIdName: '请选择生产厂', regionName: '请选择区域' }
             const val = m[field]
             const val = m[field]
             return val ? String(val) : map[field]
             return val ? String(val) : map[field]
         },
         },
@@ -453,6 +503,8 @@ export default {
                 setSheet('单价中是否已包含运费', this.yesNoList)
                 setSheet('单价中是否已包含运费', this.yesNoList)
             } else if (field === 'historyRemarks') {
             } else if (field === 'historyRemarks') {
                 setSheet('历史备注', this.customerRemarks)
                 setSheet('历史备注', this.customerRemarks)
+            }else if (field === 'region') {
+                setSheet('区域', this.regionOptions)
             }
             }
         },
         },
         onSheetConfirm({ value, label }) {
         onSheetConfirm({ value, label }) {
@@ -471,6 +523,8 @@ export default {
             let config = {}
             let config = {}
             if (fieldKey === 'buyer') {
             if (fieldKey === 'buyer') {
                 config = { title: '定作方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
                 config = { title: '定作方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
+            } else if (fieldKey === 'stockUpCompanyId') {
+                config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
             }
             }
             const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
             const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
             this.sheet.visible = false
             this.sheet.visible = false
@@ -481,7 +535,17 @@ export default {
             const _fieldKey = this.relate.fieldKey
             const _fieldKey = this.relate.fieldKey
             const first = (items && items.length > 0) ? items[0] : null
             const first = (items && items.length > 0) ? items[0] : null
             this.form[_fieldKey] = (first && first.id) ? first.id : ''
             this.form[_fieldKey] = (first && first.id) ? first.id : ''
-            this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : ''
+
+            if (_fieldKey === 'stockUpCompanyId') {
+                 this.form.stockUpCompanyName = (first && first.name) ? first.name : ''
+            } else {
+                 this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : ''
+            }
+            
+            if (_fieldKey === 'buyer') {
+                this.form.stockUpCompanyId = (first && first.id) ? first.id : ''
+                this.form.stockUpCompanyName = (first && first.name) ? first.name : ''
+            }
         },
         },
         onRadioSelect(field, nameField, opt) {
         onRadioSelect(field, nameField, opt) {
             const val = opt && opt.value != null ? opt.value : ''
             const val = opt && opt.value != null ? opt.value : ''
@@ -542,9 +606,11 @@ export default {
                 { key: 'code', label: '编号' },
                 { key: 'code', label: '编号' },
                 { key: 'supplier', label: '承揽方' },
                 { key: 'supplier', label: '承揽方' },
                 { key: 'buyer', label: '定作方' },
                 { key: 'buyer', label: '定作方' },
+                { key: 'stockUpCompanyId', label: '备货单位/人（生产标准）' },
                 { key: 'orderDate', label: '订货日期' },
                 { key: 'orderDate', label: '订货日期' },
-                { key: 'workshopId', label: '生产厂' },
                 { key: 'unit', label: '单位' },
                 { key: 'unit', label: '单位' },
+                { key: 'workshopId', label: '生产厂' },
+                { key: 'region', label: '区域' },
                 { key: 'specialTerms', label: '特别条款要求' },
                 { key: 'specialTerms', label: '特别条款要求' },
             ]
             ]
             for (const it of checks) {
             for (const it of checks) {
@@ -552,6 +618,7 @@ export default {
                 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
                 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
                 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
                 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
             }
             }
+            if (this.$refs.productRel && !this.$refs.productRel.validate()) return false
             const list = Array.isArray(this.productLineList) ? this.productLineList : []
             const list = Array.isArray(this.productLineList) ? this.productLineList : []
             if (list.length === 0) {
             if (list.length === 0) {
                 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false
                 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false

@@ -10,11 +10,17 @@ statusStyl<template>
                             }}</text></view>
                             }}</text></view>
                     <view class="row"><text class="label">定作方</text><text class="value">{{ detail.buyerName || '-'
                     <view class="row"><text class="label">定作方</text><text class="value">{{ detail.buyerName || '-'
                             }}</text></view>
                             }}</text></view>
+                    <view class="row"><text class="label">备货单位/人（生产标准）</text><text class="value">{{ detail.stockUpCompanyName || '-'
+                            }}</text></view>
                     <view class="row"><text class="label">订货日期</text><text class="value">{{ detail.orderDate }}</text>
                     <view class="row"><text class="label">订货日期</text><text class="value">{{ detail.orderDate }}</text>
                     </view>
                     </view>
                     <view class="row"><text class="label">单位</text><text class="value">{{ detail.unit }}</text></view>
                     <view class="row"><text class="label">单位</text><text class="value">{{ detail.unit }}</text></view>
                     <view class="row"><text class="label">生产厂</text><text class="value">{{ detail.workshopName || '-'
                     <view class="row"><text class="label">生产厂</text><text class="value">{{ detail.workshopName || '-'
-                            }}</text></view>    
+                            }}</text></view>
+                    <view class="row"><text class="label">办事处</text><text class="value">{{ detail.deptName || '-'
+                            }}</text></view>
+                    <view class="row"><text class="label">区域</text><text class="value">{{ detail.regionName || '-'
+                            }}</text></view>
                 </view>
                 </view>
 
 
                 <view class="section1">
                 <view class="section1">
@@ -130,10 +136,15 @@ export default {
                 supplierName: '',
                 supplierName: '',
                 buyer: '',
                 buyer: '',
                 buyerName: '',
                 buyerName: '',
+                stockUpCompanyId: '',
+                stockUpCompanyName: '',
                 orderDate: '',
                 orderDate: '',
                 unit: '',
                 unit: '',
                 workshopId: '',
                 workshopId: '',
                 workshopName: '',
                 workshopName: '',
+                deptName: '',
+                region: '',
+                regionName: '',
                 designatedConsignee: '',
                 designatedConsignee: '',
                 specialTerms: '',
                 specialTerms: '',
                 specialTermsName: '',
                 specialTermsName: '',
@@ -361,9 +372,12 @@ export default {
                 const data = res && res.data ? res.data : {}
                 const data = res && res.data ? res.data : {}
                 const includesPackagingFeeName = data.includesPackagingFeeName || (data.includesPackagingFee ? '是' : '否')
                 const includesPackagingFeeName = data.includesPackagingFeeName || (data.includesPackagingFee ? '是' : '否')
                 const includesTransportFeeName = data.includesTransportFeeName || (data.includesTransportFee ? '是' : '否')
                 const includesTransportFeeName = data.includesTransportFeeName || (data.includesTransportFee ? '是' : '否')
-                this.detail = { 
-                    ...this.detail, 
-                    ...data, 
+                this.detail = {
+                    ...this.detail,
+                    ...data,
+                    stockUpCompanyName: data.stockUpCompanyName || '',
+                    regionName: data.regionName || '',
+                    deptName: data.deptName || '',
                     includesPackagingFeeName, includesTransportFeeName,
                     includesPackagingFeeName, includesTransportFeeName,
                     destinationId: data.provinceId && data.cityId && data.districtId ? [data.provinceId, data.cityId, data.districtId] : '',
                     destinationId: data.provinceId && data.cityId && data.districtId ? [data.provinceId, data.cityId, data.districtId] : '',
                     destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '',
                     destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '',

@@ -199,6 +199,8 @@ import { getContractApi, updateContractApi } from '@/api/contract'
 import { getDicByCodes } from '@/utils/dic'
 import { getDicByCodes } from '@/utils/dic'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { workshopQueryApi } from '@/api/devManage'
 import { workshopQueryApi } from '@/api/devManage'
+import { getArea } from '@/api/credit_manage.js'
+
 export default {
 export default {
     name: 'ModifyContractProcess',
     name: 'ModifyContractProcess',
     components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector },
     components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector },
@@ -212,8 +214,14 @@ export default {
                 supplierName: '',
                 supplierName: '',
                 buyer: '',
                 buyer: '',
                 buyerName: '',
                 buyerName: '',
+                stockUpCompanyId: '',
+                stockUpCompanyName: '',
                 workshopId: '',
                 workshopId: '',
                 workshopName: '',
                 workshopName: '',
+                region: '',
+                regionName: '',
+                deptName: '',
+                deptId: '',
                 orderDate: '',
                 orderDate: '',
                 deliveryDate: '',
                 deliveryDate: '',
                 designatedConsignee: '',
                 designatedConsignee: '',
@@ -255,6 +263,7 @@ export default {
             productLineList: [],
             productLineList: [],
             newProductLineList: [],
             newProductLineList: [],
             productList: [],
             productList: [],
+            regionOptions: [],
             rawToProdRatioList: [],
             rawToProdRatioList: [],
         }
         }
     },
     },
@@ -264,6 +273,7 @@ export default {
     created() {
     created() {
         this.loadSuppliers()
         this.loadSuppliers()
         this.loadExtraOptions()
         this.loadExtraOptions()
+        this.loadRegionOptions()
         this.loadDetail()
         this.loadDetail()
         this.$nextTick(() => {
         this.$nextTick(() => {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
@@ -272,6 +282,15 @@ export default {
         })
         })
     },
     },
     methods: {
     methods: {
+        async loadRegionOptions() {
+            try {
+                const res = await getArea()
+                const list = res.data || []
+                this.regionOptions = (list || []).map(it => ({ label: it.name || '', value: it.id || '' }))
+            } catch (e) {
+                this.regionOptions = []
+            }
+        },
         async loadDetail() {
         async loadDetail() {
             if (!this.id) return
             if (!this.id) return
             try {
             try {
@@ -288,6 +307,8 @@ export default {
                     supplierName: m.supplierName || '',
                     supplierName: m.supplierName || '',
                     buyer: m.buyer || (m.customer && m.customer.id) || '',
                     buyer: m.buyer || (m.customer && m.customer.id) || '',
                     buyerName: m.buyerName || (m.customer && m.customer.name) || '',
                     buyerName: m.buyerName || (m.customer && m.customer.name) || '',
+                    stockUpCompanyId: m.stockUpCompanyId || '',
+                    stockUpCompanyName: m.stockUpCompanyName || '',
                     orderDate: m.orderDate || '',
                     orderDate: m.orderDate || '',
                     designatedConsignee: m.designatedConsignee || '',
                     designatedConsignee: m.designatedConsignee || '',
                     specialTerms: m.specialTerms || '',
                     specialTerms: m.specialTerms || '',
@@ -317,6 +338,10 @@ export default {
                     packaging: m.packaging || '',
                     packaging: m.packaging || '',
                     workshopId: m.workshopId || '',
                     workshopId: m.workshopId || '',
                     workshopName: m.workshopName || '',
                     workshopName: m.workshopName || '',
+                    region: m.region || '',
+                    regionName: m.regionName || '',
+                    deptName: m.deptName || '',
+                    deptId: m.deptId || '',
                 }
                 }
                 const lines = Array.isArray(m.contractStdProcessingLineList) ? m.contractStdProcessingLineList : []
                 const lines = Array.isArray(m.contractStdProcessingLineList) ? m.contractStdProcessingLineList : []
                 this.productLineList = lines
                 this.productLineList = lines
@@ -453,6 +478,7 @@ export default {
                 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
                 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
                 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
                 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
             }
             }
+            if (this.$refs.productRel && !this.$refs.productRel.validate()) return false
             const list = Array.isArray(this.newProductLineList) ? this.newProductLineList : []
             const list = Array.isArray(this.newProductLineList) ? this.newProductLineList : []
             if (list.length === 0) {
             if (list.length === 0) {
                 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false
                 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false

@@ -87,61 +87,61 @@
                     
                     
                     <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.thickness" :inputBorder="false" placeholder="请输入厚度" @input="onNonNegativeInput(idx, 'thickness')" @blur="onNonNegativeBlur(idx, 'thickness', 2)" />
+                            <uni-easyinput type="digit" v-model="item.thickness" :inputBorder="false" placeholder="请输入厚度" @input="onNonNegativeInput(idx, 'thickness')" @blur="onNonNegativeBlur(idx, 'thickness', 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.thicknessTolPos" :inputBorder="false"
-                                placeholder="请输入厚度公差上限" @input="onNonNegativeInput(idx, 'thicknessTolPos')" @blur="onNonNegativeBlur(idx, 'thicknessTolPos', 2)" />
+                            <uni-easyinput type="text" v-model="item.thicknessTolPos" :inputBorder="false"
+                                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"
-                                placeholder="请输入厚度公差下限" @input="onNonNegativeInput(idx, 'thicknessTolNeg')" @blur="onNonNegativeBlur(idx, 'thicknessTolNeg', 2)" />
+                            <uni-easyinput type="text" v-model="item.thicknessTolNeg" :inputBorder="false"
+                                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)">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput type="digit" v-model="item.width" :inputBorder="false" placeholder="请输入宽度" @input="onNonNegativeInput(idx, 'width')" @blur="onNonNegativeBlur(idx, 'width', 2)" />
+                            <uni-easyinput type="digit" v-model="item.width" :inputBorder="false" placeholder="请输入宽度" @input="onNonNegativeInput(idx, 'width')" @blur="onNonNegativeBlur(idx, 'width', 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.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差上限" @input="onNonNegativeInput(idx, 'widthTolPos')" @blur="onNonNegativeBlur(idx, 'widthTolPos', 2)" />
+                            <uni-easyinput type="text" 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', 2)" />
+                            <uni-easyinput type="text" 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)">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput type="digit" v-model="item.length" :inputBorder="false" placeholder="请输入长度" @input="onNonNegativeInput(idx, 'length')" @blur="onNonNegativeBlur(idx, 'length', 2)" />
+                            <uni-easyinput type="digit" v-model="item.length" :inputBorder="false" placeholder="请输入长度" @input="onNonNegativeInput(idx, 'length')" @blur="onNonNegativeBlur(idx, 'length', 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.lengthTolPos" :inputBorder="false"
-                                placeholder="请输入长度公差上限" @input="onNonNegativeInput(idx, 'lengthTolPos')" @blur="onNonNegativeBlur(idx, 'lengthTolPos', 2)" />
+                            <uni-easyinput type="text" v-model="item.lengthTolPos" :inputBorder="false"
+                                placeholder="请输入长度公差上限" @input="onNumberInput(idx, 'lengthTolPos')" @blur="onNumberBlur(idx, 'lengthTolPos', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="长度公差下限(mm)">
                     <uni-list-item title="长度公差下限(mm)">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false"
-                                placeholder="请输入长度公差下限" @input="onNonNegativeInput(idx, 'lengthTolNeg')" @blur="onNonNegativeBlur(idx, 'lengthTolNeg', 2)" />
+                            <uni-easyinput type="text" v-model="item.lengthTolNeg" :inputBorder="false"
+                                placeholder="请输入长度公差下限" @input="onNumberInput(idx, 'lengthTolNeg')" @blur="onNumberBlur(idx, 'lengthTolNeg', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="定作物数量">
                     <uni-list-item title="定作物数量">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput v-model="item.productQuantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'productQuantity')" @blur="onNonNegativeBlur(idx, 'productQuantity', 2)" />
+                            <uni-easyinput v-model="item.productQuantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'productQuantity')" @blur="onNonNegativeBlur(idx, 'productQuantity', 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.unitPrice" type="digit" :inputBorder="false" placeholder="请输入销售价格" @input="onNonNegativeInput(idx, 'unitPrice')" @blur="onNonNegativeBlur(idx, 'unitPrice', 2)" />
+                            <uni-easyinput v-model="item.unitPrice" type="digit" :inputBorder="false" placeholder="请输入销售价格" @input="onNonNegativeInput(idx, 'unitPrice')" @blur="onNonNegativeBlur(idx, 'unitPrice', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="不含税金额">
                     <uni-list-item title="不含税金额">
@@ -295,6 +295,45 @@ export default {
         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: '', rawToProdRatioName: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '',  productQuantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '' }
         },
         },
+        onNumberInput(idx, field) {
+            const it = this.items[idx]
+            if (!it) return
+            let v = String(it[field] != null ? it[field] : '')
+            v = v.replace(/[^0-9.-]/g, '')
+            if ((v.match(/-/g) || []).length > 1) {
+                 const first = v.indexOf('-') === 0 ? '-' : ''
+                 v = first + v.replace(/-/g, '')
+            } else if (v.indexOf('-') > 0) {
+                 v = v.replace(/-/g, '')
+            }
+            if ((v.match(/\./g) || []).length > 1) {
+                 const parts = v.split('.')
+                 v = parts[0] + '.' + parts.slice(1).join('')
+            }
+            it[field] = v
+            this.$set(this.items, idx, it)
+        },
+        validate() {
+            for (let i = 0; i < this.items.length; i++) {
+                const it = this.items[i]
+                const check = (pos, neg, label) => {
+                    if (pos !== '' && pos !== null && pos !== undefined &&
+                        neg !== '' && neg !== null && neg !== undefined) {
+                        if (Number(pos) <= Number(neg)) {
+                            return `第${i + 1}行产品：${label}公差上限必须大于下限`
+                        }
+                    }
+                    return null
+                }
+                let err = check(it.thicknessTolPos, it.thicknessTolNeg, '厚度')
+                if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
+                err = check(it.widthTolPos, it.widthTolNeg, '宽度')
+                if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
+                err = check(it.lengthTolPos, it.lengthTolNeg, '长度')
+                if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
+            }
+            return true
+        },
         onNonNegativeInput(idx, field) {
         onNonNegativeInput(idx, field) {
             const it = this.items[idx]
             const it = this.items[idx]
             if (!it) return
             if (!it) return

@@ -21,6 +21,13 @@
                         <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>
+                <uni-list-item class="select-item" :class="form.stockUpCompanyId ? 'is-filled' : 'is-empty'" clickable
+                    @click="openRelate('stockUpCompanyId')" :rightText="form.stockUpCompanyName || '请选择备货单位'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text class="required">*</text><text>备货单位/人（生产标准）</text></view>
+                    </template>
+                </uni-list-item>
+
 
 
                 <uni-list-item title="订货日期">
                 <uni-list-item title="订货日期">
                     <template v-slot:footer>
                     <template v-slot:footer>
@@ -39,7 +46,18 @@
 						<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 mode="add" :deliveryDateBase="form.deliveryDate" :deliveryDate="form.orderDate" @change="onProductsChange" :options="productList" />
+                <uni-list-item title="办事处">
+                    <template v-slot:footer>
+                        <uni-easyinput v-model="form.deptName" :inputBorder="false" disabled placeholder="自动获取" />
+                    </template>
+                </uni-list-item>
+                <uni-list-item class="select-item" :class="form.region ? 'is-filled' : 'is-empty'" clickable
+                    @click="openSheet('region')" :rightText="displayLabel('regionName')" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text class="required">*</text><text>区域</text></view>
+                    </template>
+                </uni-list-item>
+               <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" disabled />
                         <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false" disabled />
@@ -208,10 +226,11 @@ import SingleSelectSheet from '@/components/single-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
 import ProductRel from './productRel.vue'
 import ProductRel from './productRel.vue'
 import CitySelector from '@/components/city-selector/index.vue'
 import CitySelector from '@/components/city-selector/index.vue'
-import { getRetailCodeApi, createContractApi, getCustomerRemarks,getCustomerSpecificQualityRequirements } from '@/api/contract'
+import { getRetailCodeApi, createContractApi, getCustomerRemarks,getCustomerSpecificQualityRequirements, getDeptApi } from '@/api/contract'
 import { getDicByCodes } from '@/utils/dic'
 import { getDicByCodes } from '@/utils/dic'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { workshopQueryApi } from '@/api/devManage'
 import { workshopQueryApi } from '@/api/devManage'
+import { getArea } from '@/api/credit_manage.js'
 
 
 export default {
 export default {
     name: 'AddContractRetail',
     name: 'AddContractRetail',
@@ -224,6 +243,8 @@ export default {
                 supplierName: '',
                 supplierName: '',
                 buyer: '',
                 buyer: '',
                 buyerName: '',
                 buyerName: '',
+                stockUpCompanyId: '',
+                stockUpCompanyName: '',
                 orderDate: '',
                 orderDate: '',
                 deliveryDate: '',
                 deliveryDate: '',
                 designatedConsignee: '',
                 designatedConsignee: '',
@@ -242,6 +263,10 @@ export default {
                 destinationLabel: '',
                 destinationLabel: '',
                 workshopIdName: '',
                 workshopIdName: '',
                 workshopId: '',
                 workshopId: '',
+                deptName: '',
+                deptId: '',
+                region: '',
+                regionName: '',
                 remarks: '',
                 remarks: '',
                 component: '',
                 component: '',
                 packaging: '',
                 packaging: '',
@@ -263,12 +288,15 @@ export default {
             productList: [],
             productList: [],
             customerRemarks: [],
             customerRemarks: [],
             defaultRemark: '',
             defaultRemark: '',
+            regionOptions: [],
         }
         }
     },
     },
     created() {
     created() {
         this.loadSuppliers()
         this.loadSuppliers()
         this.loadExtraOptions()
         this.loadExtraOptions()
         this.initCode()
         this.initCode()
+        this.getDept()
+        this.loadRegionOptions()
         this.form.orderDate = this.formatDate(new Date())
         this.form.orderDate = this.formatDate(new Date())
         this.$nextTick(() => {
         this.$nextTick(() => {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
@@ -318,6 +346,24 @@ export default {
         },
         },
     },
     },
     methods: {
     methods: {
+        async loadRegionOptions() {
+            try {
+                const res = await getArea()
+                const list = res.data || []
+                this.regionOptions = (list || []).map(it => ({ label: it.name || '', value: it.id || '' }))
+            } catch (e) {
+                this.regionOptions = []
+            }
+        },
+        // 查询当前人所在办事处
+        getDept() {
+            getDeptApi().then(res => {
+                if (res.code === 200) {
+                    this.form.deptName = res.data.name || ''
+                    this.form.deptId = res.data.id || ''
+                }
+            })
+        },
         getHistory() {
         getHistory() {
             console.log('this.productLineList', this.productLineList[0].productId)
             console.log('this.productLineList', this.productLineList[0].productId)
             if (!this.productLineList.length || !this.productLineList[0].productId) {
             if (!this.productLineList.length || !this.productLineList[0].productId) {
@@ -405,7 +451,7 @@ export default {
         },
         },
         displayLabel(field) {
         displayLabel(field) {
             const m = this.form
             const m = this.form
-            const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopIdName: '请选择生产厂' }
+            const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopIdName: '请选择生产厂', regionName: '请选择区域' }
             const val = m[field]
             const val = m[field]
             return val ? String(val) : map[field]
             return val ? String(val) : map[field]
         },
         },
@@ -450,6 +496,8 @@ export default {
                 setSheet('单价中是否已包含运费', this.yesNoList)
                 setSheet('单价中是否已包含运费', this.yesNoList)
             } else if (field === 'historyRemarks') {
             } else if (field === 'historyRemarks') {
                 setSheet('历史备注', this.customerRemarks)
                 setSheet('历史备注', this.customerRemarks)
+            }else if (field === 'region') {
+                setSheet('区域', this.regionOptions)
             }
             }
         },
         },
         onSheetConfirm({ value, label }) {
         onSheetConfirm({ value, label }) {
@@ -468,6 +516,8 @@ export default {
             let config = {}
             let config = {}
             if (fieldKey === 'buyer') {
             if (fieldKey === 'buyer') {
                 config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
                 config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
+            } else if (fieldKey === 'stockUpCompanyId') {
+                config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
             }
             }
             const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
             const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
             this.sheet.visible = false
             this.sheet.visible = false
@@ -478,7 +528,17 @@ export default {
             const _fieldKey = this.relate.fieldKey
             const _fieldKey = this.relate.fieldKey
             const first = (items && items.length > 0) ? items[0] : null
             const first = (items && items.length > 0) ? items[0] : null
             this.form[_fieldKey] = (first && first.id) ? first.id : ''
             this.form[_fieldKey] = (first && first.id) ? first.id : ''
-            this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : ''
+
+            if (_fieldKey === 'stockUpCompanyId') {
+                 this.form.stockUpCompanyName = (first && first.name) ? first.name : ''
+            } else {
+                 this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : ''
+            }
+            
+            if (_fieldKey === 'buyer') {
+                this.form.stockUpCompanyId = (first && first.id) ? first.id : ''
+                this.form.stockUpCompanyName = (first && first.name) ? first.name : ''
+            }
         },
         },
         onRadioSelect(field, nameField, opt) {
         onRadioSelect(field, nameField, opt) {
             const val = opt && opt.value != null ? opt.value : ''
             const val = opt && opt.value != null ? opt.value : ''
@@ -534,9 +594,11 @@ export default {
                 { key: 'code', label: '编号' },
                 { key: 'code', label: '编号' },
                 { key: 'supplier', label: '供方' },
                 { key: 'supplier', label: '供方' },
                 { key: 'buyer', label: '需方' },
                 { key: 'buyer', label: '需方' },
+                { key: 'stockUpCompanyId', label: '备货单位/人（生产标准）' },
                 { key: 'orderDate', label: '订货日期' },
                 { key: 'orderDate', label: '订货日期' },
                 { key: 'unit', label: '单位' },
                 { key: 'unit', label: '单位' },
                 { key: 'workshopId', label: '生产厂' },
                 { key: 'workshopId', label: '生产厂' },
+                { key: 'region', label: '区域' },
                 { key: 'specialTerms', label: '特别条款要求' },
                 { key: 'specialTerms', label: '特别条款要求' },
             ]
             ]
             for (const it of checks) {
             for (const it of checks) {
@@ -544,6 +606,7 @@ export default {
                 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
                 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
                 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
                 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
             }
             }
+            if (this.$refs.productRel && !this.$refs.productRel.validate()) return false
             const list = Array.isArray(this.productLineList) ? this.productLineList : []
             const list = Array.isArray(this.productLineList) ? this.productLineList : []
             if (list.length === 0) {
             if (list.length === 0) {
                 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false
                 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false

@@ -10,11 +10,17 @@
                             '-'}}</text></view>
                             '-'}}</text></view>
                     <view class="row"><text class="label">需方</text><text class="value">{{ detail.buyerName ||
                     <view class="row"><text class="label">需方</text><text class="value">{{ detail.buyerName ||
                             '-'}}</text></view>
                             '-'}}</text></view>
+                    <view class="row"><text class="label">备货单位/人（生产标准）</text><text class="value">{{ detail.stockUpCompanyName || '-'
+                    }}</text></view>
                     <view class="row"><text class="label">订货日期</text><text class="value">{{ detail.orderDate }}</text>
                     <view class="row"><text class="label">订货日期</text><text class="value">{{ detail.orderDate }}</text>
                     </view>
                     </view>
                     <view class="row"><text class="label">单位</text><text class="value">{{ detail.unit }}</text></view>
                     <view class="row"><text class="label">单位</text><text class="value">{{ detail.unit }}</text></view>
                     <view class="row"><text class="label">生产厂</text><text class="value">{{ detail.workshopName ||
                     <view class="row"><text class="label">生产厂</text><text class="value">{{ detail.workshopName ||
                             '-'}}</text></view>
                             '-'}}</text></view>
+                    <view class="row"><text class="label">办事处</text><text class="value">{{ detail.deptName || '-'
+                    }}</text></view>
+                    <view class="row"><text class="label">区域</text><text class="value">{{ detail.regionName || '-'
+                    }}</text></view>
                 </view>
                 </view>
 
 
                 <view class="section1">
                 <view class="section1">
@@ -156,7 +162,11 @@ export default {
                 tolerance: '',
                 tolerance: '',
                 performance: '',
                 performance: '',
                 component: '',
                 component: '',
-                packaging: ''
+                packaging: '',
+                stockUpCompanyId: '',
+                stockUpCompanyName: '',
+                region: '',
+                regionName: '',
             },
             },
             productList: [],
             productList: [],
             fileInfo: { id: '', name: '' },
             fileInfo: { id: '', name: '' },

@@ -21,7 +21,7 @@
                         <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>
-
+                
                 <uni-list-item class="select-item" :class="form.workshopId ? 'is-filled' : 'is-empty'" clickable
                 <uni-list-item class="select-item" :class="form.workshopId ? 'is-filled' : 'is-empty'" clickable
                     @click="openSheet('workshopId')" :rightText="form.workshopName || '请选择生产厂'" showArrow>
                     @click="openSheet('workshopId')" :rightText="form.workshopName || '请选择生产厂'" showArrow>
                     <template v-slot:body>
                     <template v-slot:body>
@@ -40,8 +40,23 @@
                         <uni-easyinput v-model="form.unit" :inputBorder="false" disabled />
                         <uni-easyinput v-model="form.unit" :inputBorder="false" disabled />
                     </template>
                     </template>
                 </uni-list-item>
                 </uni-list-item>
-
-                <ProductRel mode="add" :deliveryDateBase="form.deliveryDate"  :deliveryDate="form.orderDate" :list="productLineList" @change="onProductsChange" :options="productList" />
+                <uni-list-item class="select-item" :class="form.deptName ? 'is-filled' : 'is-empty'">
+                <template v-slot:body>
+                    <view class="item-title"><text class="required">*</text><text>办事处</text></view>
+                </template>
+                <template v-slot:footer>
+                    <view class="serial-number-row">
+                    <uni-easyinput v-model="form.deptName" :inputBorder="false" disabled />
+                    </view>
+                </template>
+                </uni-list-item>
+                <uni-list-item class="select-item" :class="form.region ? 'is-filled' : 'is-empty'" clickable
+                @click="openSheet('region')" :rightText="displayLabel('regionName')" showArrow>
+                <template v-slot:body>
+                    <view class="item-title"><text class="required">*</text><text>区域</text></view>
+                </template>
+                </uni-list-item>
+                <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>
@@ -199,6 +214,8 @@ import { getContractApi, updateContractApi } from '@/api/contract'
 import { getDicByCodes } from '@/utils/dic'
 import { getDicByCodes } from '@/utils/dic'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { workshopQueryApi } from '@/api/devManage'
 import { workshopQueryApi } from '@/api/devManage'
+import { getArea } from '@/api/credit_manage.js'
+
 export default {
 export default {
     name: 'ModifyContractRetail',
     name: 'ModifyContractRetail',
     components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector },
     components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector },
@@ -212,6 +229,12 @@ export default {
                 supplierName: '',
                 supplierName: '',
                 buyer: '',
                 buyer: '',
                 buyerName: '',
                 buyerName: '',
+                stockUpCompanyId: '',
+                stockUpCompanyName: '',
+                region: '',
+                regionName: '',
+                deptName: '',
+                deptId: '',
                 workshopId: '',
                 workshopId: '',
                 workshopName: '',
                 workshopName: '',
                 orderDate: '',
                 orderDate: '',
@@ -254,7 +277,8 @@ export default {
             totalAmountIncludingTax: 0,
             totalAmountIncludingTax: 0,
             productLineList: [],
             productLineList: [],
             newProductLineList: [],
             newProductLineList: [],
-            productList: []
+            productList: [],
+            regionOptions: []
         }
         }
     },
     },
     onLoad(query) {
     onLoad(query) {
@@ -263,6 +287,7 @@ export default {
     created() {
     created() {
         this.loadSuppliers()
         this.loadSuppliers()
         this.loadExtraOptions()
         this.loadExtraOptions()
+        this.loadRegionOptions()
         this.loadDetail()
         this.loadDetail()
         this.$nextTick(() => {
         this.$nextTick(() => {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
@@ -271,6 +296,15 @@ export default {
         })
         })
     },
     },
     methods: {
     methods: {
+        async loadRegionOptions() {
+            try {
+                const res = await getArea()
+                const list = res.data || []
+                this.regionOptions = (list || []).map(it => ({ label: it.name || '', value: it.id || '' }))
+            } catch (e) {
+                this.regionOptions = []
+            }
+        },
         async loadDetail() {
         async loadDetail() {
             if (!this.id) return
             if (!this.id) return
             try {
             try {
@@ -316,6 +350,12 @@ export default {
                     packaging: m.packaging || '',
                     packaging: m.packaging || '',
                     workshopId: m.workshopId || '',
                     workshopId: m.workshopId || '',
                     workshopName: m.workshopName || '',
                     workshopName: m.workshopName || '',
+                    stockUpCompanyId: m.stockUpCompanyId || '',
+                    stockUpCompanyName: m.stockUpCompanyName || '',
+                    region: m.region || '',
+                    regionName: m.regionName || '',
+                    deptName: m.deptName || '',
+                    deptId: m.deptId || '',
                 }
                 }
                 const lines = Array.isArray(m.contractDistributorLineList) ? m.contractDistributorLineList : []
                 const lines = Array.isArray(m.contractDistributorLineList) ? m.contractDistributorLineList : []
                 this.productLineList = lines
                 this.productLineList = lines
@@ -371,7 +411,7 @@ export default {
         },
         },
         displayLabel(field) {
         displayLabel(field) {
             const m = this.form
             const m = this.form
-            const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopName: '请选择生产厂' }
+            const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopName: '请选择生产厂', regionName: '请选择区域' }
             const val = m[field]
             const val = m[field]
             return val ? String(val) : map[field]
             return val ? String(val) : map[field]
         },
         },
@@ -400,6 +440,8 @@ export default {
                 setSheet('单价中是否已包含包装费', this.yesNoList)
                 setSheet('单价中是否已包含包装费', this.yesNoList)
             } else if (field === 'includesTransportFee') {
             } else if (field === 'includesTransportFee') {
                 setSheet('单价中是否已包含运费', this.yesNoList)
                 setSheet('单价中是否已包含运费', this.yesNoList)
+            } else if (field === 'region') {
+                setSheet('区域', this.regionOptions)
             }
             }
         },
         },
         onSheetConfirm({ value, label }) {
         onSheetConfirm({ value, label }) {
@@ -413,6 +455,8 @@ export default {
             let config = {}
             let config = {}
             if (fieldKey === 'buyer') {
             if (fieldKey === 'buyer') {
                 config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
                 config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
+            } else if (fieldKey === 'stockUpCompanyId') {
+                config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
             }
             }
             const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
             const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
             this.sheet.visible = false
             this.sheet.visible = false
@@ -423,7 +467,11 @@ export default {
             const _fieldKey = this.relate.fieldKey
             const _fieldKey = this.relate.fieldKey
             const first = (items && items.length > 0) ? items[0] : null
             const first = (items && items.length > 0) ? items[0] : null
             this.form[_fieldKey] = (first && first.id) ? first.id : ''
             this.form[_fieldKey] = (first && first.id) ? first.id : ''
-            this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : ''
+            if (_fieldKey === 'stockUpCompanyId') {
+                 this.form.stockUpCompanyName = (first && first.name) ? first.name : ''
+            } else {
+                 this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : ''
+            }this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : ''
         },
         },
         onRadioSelect(field, nameField, opt) {
         onRadioSelect(field, nameField, opt) {
             const val = opt && opt.value != null ? opt.value : ''
             const val = opt && opt.value != null ? opt.value : ''
@@ -443,12 +491,15 @@ export default {
                 { key: 'unit', label: '单位' },
                 { key: 'unit', label: '单位' },
                 { key: 'workshopId', label: '生产厂' },
                 { key: 'workshopId', label: '生产厂' },
                 { key: 'specialTerms', label: '特别条款要求' },
                 { key: 'specialTerms', label: '特别条款要求' },
+                { key: 'stockUpCompanyId', label: '备货单位/人（生产标准）' },
+                { key: 'region', label: '区域' },
             ]
             ]
             for (const it of checks) {
             for (const it of checks) {
                 const val = this.form[it.key]
                 const val = this.form[it.key]
                 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
                 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
                 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
                 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
             }
             }
+            if (this.$refs.productRel && !this.$refs.productRel.validate()) return false
             const list = Array.isArray(this.newProductLineList) ? this.newProductLineList : []
             const list = Array.isArray(this.newProductLineList) ? this.newProductLineList : []
             if (list.length === 0) {
             if (list.length === 0) {
                 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false
                 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false

@@ -55,51 +55,51 @@
                     </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.thickness" :inputBorder="false" placeholder="请输入厚度" @input="onNonNegativeInput(idx, 'thickness')" @blur="onNonNegativeBlur(idx, 'thickness', 2)" />
+                            <uni-easyinput type="digit" v-model="item.thickness" :inputBorder="false" placeholder="请输入厚度" @input="onNonNegativeInput(idx, 'thickness')" @blur="onNonNegativeBlur(idx, 'thickness', 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.thicknessTolPos" :inputBorder="false"
-                                placeholder="请输入厚度公差上限" @input="onNonNegativeInput(idx, 'thicknessTolPos')" @blur="onNonNegativeBlur(idx, 'thicknessTolPos', 2)" />
+                            <uni-easyinput type="text" v-model="item.thicknessTolPos" :inputBorder="false"
+                                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"
-                                placeholder="请输入厚度公差下限" @input="onNonNegativeInput(idx, 'thicknessTolNeg')" @blur="onNonNegativeBlur(idx, 'thicknessTolNeg', 2)" />
+                            <uni-easyinput type="text" v-model="item.thicknessTolNeg" :inputBorder="false"
+                                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)">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput type="digit" v-model="item.width" :inputBorder="false" placeholder="请输入宽度" @input="onNonNegativeInput(idx, 'width')" @blur="onNonNegativeBlur(idx, 'width', 2)" />
+                            <uni-easyinput type="digit" v-model="item.width" :inputBorder="false" placeholder="请输入宽度" @input="onNonNegativeInput(idx, 'width')" @blur="onNonNegativeBlur(idx, 'width', 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.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差上限" @input="onNonNegativeInput(idx, 'widthTolPos')" @blur="onNonNegativeBlur(idx, 'widthTolPos', 2)" />
+                            <uni-easyinput type="text" 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', 2)" />
+                            <uni-easyinput type="text" 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)">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput type="digit" v-model="item.length" :inputBorder="false" placeholder="请输入长度" @input="onNonNegativeInput(idx, 'length')" @blur="onNonNegativeBlur(idx, 'length', 2)" />
+                            <uni-easyinput type="digit" v-model="item.length" :inputBorder="false" placeholder="请输入长度" @input="onNonNegativeInput(idx, 'length')" @blur="onNonNegativeBlur(idx, 'length', 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.lengthTolPos" :inputBorder="false"
-                                placeholder="请输入长度公差上限" @input="onNonNegativeInput(idx, 'lengthTolPos')" @blur="onNonNegativeBlur(idx, 'lengthTolPos', 2)" />
+                            <uni-easyinput type="text" v-model="item.lengthTolPos" :inputBorder="false"
+                                placeholder="请输入长度公差上限" @input="onNumberInput(idx, 'lengthTolPos')" @blur="onNumberBlur(idx, 'lengthTolPos', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="长度公差下限(mm)">
                     <uni-list-item title="长度公差下限(mm)">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false"
-                                placeholder="请输入长度公差下限" @input="onNonNegativeInput(idx, 'lengthTolNeg')" @blur="onNonNegativeBlur(idx, 'lengthTolNeg', 2)" />
+                            <uni-easyinput type="text" v-model="item.lengthTolNeg" :inputBorder="false"
+                                placeholder="请输入长度公差下限" @input="onNumberInput(idx, 'lengthTolNeg')" @blur="onNumberBlur(idx, 'lengthTolNeg', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="状态">
                     <uni-list-item title="状态">
@@ -109,12 +109,12 @@
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="数量kg">
                     <uni-list-item title="数量kg">
                         <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', 2)" />
+                            <uni-easyinput v-model="item.quantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'quantity')" @blur="onNonNegativeBlur(idx, 'quantity', 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.unitPrice" type="digit" :inputBorder="false" placeholder="请输入销售价格" @input="onNonNegativeInput(idx, 'unitPrice')" @blur="onNonNegativeBlur(idx, 'unitPrice', 2)" />
+                            <uni-easyinput v-model="item.unitPrice" type="digit" :inputBorder="false" placeholder="请输入销售价格" @input="onNonNegativeInput(idx, 'unitPrice')" @blur="onNonNegativeBlur(idx, 'unitPrice', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="不含税金额">
                     <uni-list-item title="不含税金额">
@@ -259,6 +259,61 @@ export default {
         defaultItem() {
         defaultItem() {
             return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '' }
             return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '' }
         },
         },
+        onNumberInput(idx, field) {
+            const it = this.items[idx]
+            if (!it) return
+            let v = String(it[field] != null ? it[field] : '')
+            v = v.replace(/[^0-9.-]/g, '')
+            if ((v.match(/-/g) || []).length > 1) {
+                 const first = v.indexOf('-') === 0 ? '-' : ''
+                 v = first + v.replace(/-/g, '')
+            } else if (v.indexOf('-') > 0) {
+                 v = v.replace(/-/g, '')
+            }
+            if ((v.match(/\./g) || []).length > 1) {
+                 const parts = v.split('.')
+                 v = parts[0] + '.' + parts.slice(1).join('')
+            }
+            it[field] = v
+            this.$set(this.items, idx, it)
+        },
+        onNumberBlur(idx, field, digits) {
+            const it = this.items[idx]
+            if (!it) return
+            let raw = it[field]
+            if (raw === '' || raw === null || raw === undefined || raw === '-') {
+                if (raw === '-') it[field] = ''
+                this.$set(this.items, idx, it)
+                return
+            }
+            let val = parseFloat(raw)
+            if (isNaN(val)) val = 0
+            const m = Math.pow(10, digits)
+            const rounded = Math.round(val * m) / m
+            it[field] = rounded
+            this.$set(this.items, idx, it)
+        },
+        validate() {
+            for (let i = 0; i < this.items.length; i++) {
+                const it = this.items[i]
+                const check = (pos, neg, label) => {
+                    if (pos !== '' && pos !== null && pos !== undefined &&
+                        neg !== '' && neg !== null && neg !== undefined) {
+                        if (Number(pos) <= Number(neg)) {
+                            return `第${i + 1}行产品：${label}公差上限必须大于下限`
+                        }
+                    }
+                    return null
+                }
+                let err = check(it.thicknessTolPos, it.thicknessTolNeg, '厚度')
+                if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
+                err = check(it.widthTolPos, it.widthTolNeg, '宽度')
+                if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
+                err = check(it.lengthTolPos, it.lengthTolNeg, '长度')
+                if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
+            }
+            return true
+        },
         onNonNegativeInput(idx, field) {
         onNonNegativeInput(idx, field) {
             const it = this.items[idx]
             const it = this.items[idx]
             if (!it) return
             if (!it) return

@@ -21,7 +21,12 @@
                         <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>
-
+                <uni-list-item class="select-item" :class="form.stockUpCompanyId ? 'is-filled' : 'is-empty'" clickable
+                    @click="openRelate('stockUpCompanyId')" :rightText="form.stockUpCompanyName || '请选择备货单位'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text class="required">*</text><text>备货单位/人（生产标准）</text></view>
+                    </template>
+                </uni-list-item>
                 <uni-list-item title="订货日期">
                 <uni-list-item title="订货日期">
                     <template v-slot:footer>
                     <template v-slot:footer>
                         <uni-datetime-picker type="date" v-model="form.orderDate" />
                         <uni-datetime-picker type="date" v-model="form.orderDate" />
@@ -39,7 +44,18 @@
 						<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 mode="add"  :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" @change="onProductsChange" :options="productList" />
+                <uni-list-item title="办事处">
+                    <template v-slot:footer>
+                        <uni-easyinput v-model="form.deptName" :inputBorder="false" disabled placeholder="自动获取" />
+                    </template>
+                </uni-list-item>
+                <uni-list-item class="select-item" :class="form.region ? 'is-filled' : 'is-empty'" clickable
+                    @click="openSheet('region')" :rightText="displayLabel('regionName')" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text class="required">*</text><text>区域</text></view>
+                    </template>
+                </uni-list-item>
+                <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 />
@@ -208,10 +224,11 @@ import SingleSelectSheet from '@/components/single-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
 import ProductRel from './productRel.vue'
 import ProductRel from './productRel.vue'
 import CitySelector from '@/components/city-selector/index.vue'
 import CitySelector from '@/components/city-selector/index.vue'
-import { getRetailCodeApi, createContractApi,getCustomerRemarks,getCustomerSpecificQualityRequirements } from '@/api/contract'
+import { getRetailCodeApi, createContractApi,getCustomerRemarks,getCustomerSpecificQualityRequirements, getDeptApi } from '@/api/contract'
 import { getDicByCodes } from '@/utils/dic'
 import { getDicByCodes } from '@/utils/dic'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { workshopQueryApi } from '@/api/devManage'
 import { workshopQueryApi } from '@/api/devManage'
+import { getArea } from '@/api/credit_manage.js'
 
 
 export default {
 export default {
     name: 'AddContractStock',
     name: 'AddContractStock',
@@ -224,6 +241,8 @@ export default {
                 supplierName: '',
                 supplierName: '',
                 buyer: '',
                 buyer: '',
                 buyerName: '',
                 buyerName: '',
+                stockUpCompanyId: '',
+                stockUpCompanyName: '',
                 orderDate: '',
                 orderDate: '',
                 deliveryDate: '',
                 deliveryDate: '',
                 designatedConsignee: '',
                 designatedConsignee: '',
@@ -242,6 +261,10 @@ export default {
                 destinationLabel: '',
                 destinationLabel: '',
                 workshopIdName: '',
                 workshopIdName: '',
                 workshopId: '',
                 workshopId: '',
+                deptName: '',
+                deptId: '',
+                region: '',
+                regionName: '',
                 remarks: '',
                 remarks: '',
                 component: '',
                 component: '',
                 packaging: '',
                 packaging: '',
@@ -263,12 +286,15 @@ export default {
             productList: [],
             productList: [],
             customerRemarks: [],
             customerRemarks: [],
             defaultRemark: '',
             defaultRemark: '',
+            regionOptions: [],
         }
         }
     },
     },
     created() {
     created() {
         this.loadSuppliers()
         this.loadSuppliers()
         this.loadExtraOptions()
         this.loadExtraOptions()
         this.initCode()
         this.initCode()
+        this.getDept()
+        this.loadRegionOptions()
         this.form.orderDate = this.formatDate(new Date())
         this.form.orderDate = this.formatDate(new Date())
         this.$nextTick(() => {
         this.$nextTick(() => {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
@@ -317,6 +343,24 @@ export default {
         },
         },
     },
     },
     methods: {
     methods: {
+        async loadRegionOptions() {
+            try {
+                const res = await getArea()
+                const list = res.data || []
+                this.regionOptions = (list || []).map(it => ({ label: it.name || '', value: it.id || '' }))
+            } catch (e) {
+                this.regionOptions = []
+            }
+        },
+        // 查询当前人所在办事处
+        getDept() {
+            getDeptApi().then(res => {
+                if (res.code === 200) {
+                    this.form.deptName = res.data.name || ''
+                    this.form.deptId = res.data.id || ''
+                }
+            })
+        },
         getHistory() {
         getHistory() {
             console.log('this.productLineList', this.productLineList[0].productId)
             console.log('this.productLineList', this.productLineList[0].productId)
             if (!this.productLineList.length || !this.productLineList[0].productId) {
             if (!this.productLineList.length || !this.productLineList[0].productId) {
@@ -404,7 +448,7 @@ export default {
         },
         },
         displayLabel(field) {
         displayLabel(field) {
             const m = this.form
             const m = this.form
-            const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopIdName: '请选择生产厂' }
+            const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopIdName: '请选择生产厂', regionName: '请选择区域' }
             const val = m[field]
             const val = m[field]
             return val ? String(val) : map[field]
             return val ? String(val) : map[field]
         },
         },
@@ -449,6 +493,8 @@ export default {
                 setSheet('单价中是否已包含运费', this.yesNoList)
                 setSheet('单价中是否已包含运费', this.yesNoList)
             } else if (field === 'historyRemarks') {
             } else if (field === 'historyRemarks') {
                 setSheet('历史备注', this.customerRemarks)
                 setSheet('历史备注', this.customerRemarks)
+            } else if (field === 'region') {
+                setSheet('区域', this.regionOptions)
             }
             }
         },
         },
         onSheetConfirm({ value, label }) {
         onSheetConfirm({ value, label }) {
@@ -467,6 +513,8 @@ export default {
             let config = {}
             let config = {}
             if (fieldKey === 'buyer') {
             if (fieldKey === 'buyer') {
                 config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
                 config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
+            } else if (fieldKey === 'stockUpCompanyId') {
+                config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
             }
             }
             const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
             const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
             this.sheet.visible = false
             this.sheet.visible = false
@@ -477,7 +525,17 @@ export default {
             const _fieldKey = this.relate.fieldKey
             const _fieldKey = this.relate.fieldKey
             const first = (items && items.length > 0) ? items[0] : null
             const first = (items && items.length > 0) ? items[0] : null
             this.form[_fieldKey] = (first && first.id) ? first.id : ''
             this.form[_fieldKey] = (first && first.id) ? first.id : ''
-            this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : ''
+
+            if (_fieldKey === 'stockUpCompanyId') {
+                 this.form.stockUpCompanyName = (first && first.name) ? first.name : ''
+            } else {
+                 this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : ''
+            }
+            
+            if (_fieldKey === 'buyer') {
+                this.form.stockUpCompanyId = (first && first.id) ? first.id : ''
+                this.form.stockUpCompanyName = (first && first.name) ? first.name : ''
+            }
         },
         },
         onRadioSelect(field, nameField, opt) {
         onRadioSelect(field, nameField, opt) {
             const val = opt && opt.value != null ? opt.value : ''
             const val = opt && opt.value != null ? opt.value : ''
@@ -543,6 +601,7 @@ export default {
                 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
                 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
                 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
                 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
             }
             }
+            if (this.$refs.productRel && !this.$refs.productRel.validate()) return false
             const list = Array.isArray(this.productLineList) ? this.productLineList : []
             const list = Array.isArray(this.productLineList) ? this.productLineList : []
             if (list.length === 0) {
             if (list.length === 0) {
                 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false
                 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false

@@ -17,11 +17,18 @@
                             }}</text></view>
                             }}</text></view>
                     <view class="row"><text class="label">需方</text><text class="value">{{ detail.buyerName || '-'
                     <view class="row"><text class="label">需方</text><text class="value">{{ detail.buyerName || '-'
                             }}</text></view>
                             }}</text></view>
+                    <view class="row"><text class="label">备货单位/人（生产标准）</text><text class="value">{{ detail.stockUpCompanyName || '-'
+                            }}</text></view>
+                    
                     <view class="row"><text class="label">订货日期</text><text class="value">{{ detail.orderDate }}</text>
                     <view class="row"><text class="label">订货日期</text><text class="value">{{ detail.orderDate }}</text>
                     </view>
                     </view>
                     <view class="row"><text class="label">单位</text><text class="value">{{ detail.unit }}</text></view>
                     <view class="row"><text class="label">单位</text><text class="value">{{ detail.unit }}</text></view>
                     <view class="row"><text class="label">生产厂</text><text class="value">{{ detail.workshopName || '-'
                     <view class="row"><text class="label">生产厂</text><text class="value">{{ detail.workshopName || '-'
-                            }}</text></view>    
+                            }}</text></view>   
+                    <view class="row"><text class="label">办事处</text><text class="value">{{ detail.deptName || '-'
+                            }}</text></view>
+                    <view class="row"><text class="label">区域</text><text class="value">{{ detail.regionName || '-'
+                            }}</text></view> 
                 </view>
                 </view>
 
 
                 <view class="section1">
                 <view class="section1">
@@ -139,6 +146,11 @@ export default {
                 supplierName: '',
                 supplierName: '',
                 buyer: '',
                 buyer: '',
                 buyerName: '',
                 buyerName: '',
+                stockUpCompanyId: '',
+                stockUpCompanyName: '',
+                deptName: '',
+                region: '',
+                regionName: '',
                 orderDate: '',
                 orderDate: '',
                 unit: '',
                 unit: '',
                 workshopId: '',
                 workshopId: '',

@@ -22,6 +22,14 @@
                     </template>
                     </template>
                 </uni-list-item>
                 </uni-list-item>
 
 
+                <uni-list-item class="select-item" :class="form.stockUpCompanyId ? 'is-filled' : 'is-empty'" clickable
+                    @click="openRelate('stockUpCompanyId')" :rightText="form.stockUpCompanyName || '请选择备货单位'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text class="required">*</text><text>备货单位/人（生产标准）</text></view>
+                    </template>
+                </uni-list-item>
+                
+
                 <uni-list-item class="select-item" :class="form.workshopId ? 'is-filled' : 'is-empty'" clickable
                 <uni-list-item class="select-item" :class="form.workshopId ? 'is-filled' : 'is-empty'" clickable
                     @click="openSheet('workshopId')" :rightText="form.workshopName || '请选择生产厂'" showArrow>
                     @click="openSheet('workshopId')" :rightText="form.workshopName || '请选择生产厂'" showArrow>
                     <template v-slot:body>
                     <template v-slot:body>
@@ -40,8 +48,18 @@
                         <uni-easyinput v-model="form.unit" :inputBorder="false" disabled />
                         <uni-easyinput v-model="form.unit" :inputBorder="false" disabled />
                     </template>
                     </template>
                 </uni-list-item>
                 </uni-list-item>
-
-                <ProductRel mode="add"  :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" :list="productLineList" @change="onProductsChange" :options="productList" />
+                <uni-list-item title="办事处">
+                    <template v-slot:footer>
+                        <uni-easyinput v-model="form.deptName" :inputBorder="false" disabled placeholder="自动获取" />
+                    </template>
+                </uni-list-item>
+                <uni-list-item class="select-item" :class="form.region ? 'is-filled' : 'is-empty'" clickable
+                    @click="openSheet('region')" :rightText="displayLabel('regionName')" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text class="required">*</text><text>区域</text></view>
+                    </template>
+                </uni-list-item>
+                <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>
@@ -195,10 +213,11 @@ import SingleSelectSheet from '@/components/single-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
 import ProductRel from './productRel.vue'
 import ProductRel from './productRel.vue'
 import CitySelector from '@/components/city-selector/index.vue'
 import CitySelector from '@/components/city-selector/index.vue'
-import { getContractApi, updateContractApi } from '@/api/contract'
+import { getContractApi, updateContractApi, getDeptApi } from '@/api/contract'
 import { getDicByCodes } from '@/utils/dic'
 import { getDicByCodes } from '@/utils/dic'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { workshopQueryApi } from '@/api/devManage'
 import { workshopQueryApi } from '@/api/devManage'
+import { getArea } from '@/api/credit_manage.js'
 export default {
 export default {
     name: 'ModifyContractStock',
     name: 'ModifyContractStock',
     components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector },
     components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector },
@@ -212,8 +231,14 @@ export default {
                 supplierName: '',
                 supplierName: '',
                 buyer: '',
                 buyer: '',
                 buyerName: '',
                 buyerName: '',
+                stockUpCompanyId: '',
+                stockUpCompanyName: '',
                 workshopId: '',
                 workshopId: '',
                 workshopName: '',
                 workshopName: '',
+                deptName: '',
+                deptId: '',
+                region: '',
+                regionName: '',
                 orderDate: '',
                 orderDate: '',
                 deliveryDate: '',
                 deliveryDate: '',
                 designatedConsignee: '',
                 designatedConsignee: '',
@@ -254,7 +279,8 @@ export default {
             totalAmountIncludingTax: 0,
             totalAmountIncludingTax: 0,
             productLineList: [],
             productLineList: [],
             newProductLineList: [],
             newProductLineList: [],
-            productList: []
+            productList: [],
+            regionOptions: [],
         }
         }
     },
     },
     onLoad(query) {
     onLoad(query) {
@@ -264,6 +290,7 @@ export default {
         this.loadSuppliers()
         this.loadSuppliers()
         this.loadExtraOptions()
         this.loadExtraOptions()
         this.loadDetail()
         this.loadDetail()
+        this.loadRegionOptions()
         this.$nextTick(() => {
         this.$nextTick(() => {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
                 this.initDestinationLabel()
                 this.initDestinationLabel()
@@ -271,6 +298,15 @@ export default {
         })
         })
     },
     },
     methods: {
     methods: {
+        async loadRegionOptions() {
+            try {
+                const res = await getArea()
+                const list = res.data || []
+                this.regionOptions = (list || []).map(it => ({ label: it.name || '', value: it.id || '' }))
+            } catch (e) {
+                this.regionOptions = []
+            }
+        },
         async loadDetail() {
         async loadDetail() {
             if (!this.id) return
             if (!this.id) return
             try {
             try {
@@ -287,6 +323,12 @@ export default {
                     supplierName: m.supplierName || '',
                     supplierName: m.supplierName || '',
                     buyer: m.buyer || (m.customer && m.customer.id) || '',
                     buyer: m.buyer || (m.customer && m.customer.id) || '',
                     buyerName: m.buyerName || (m.customer && m.customer.name) || '',
                     buyerName: m.buyerName || (m.customer && m.customer.name) || '',
+                    stockUpCompanyId: m.stockUpCompanyId || '',
+                    stockUpCompanyName: m.stockUpCompanyName || '',
+                    deptName: m.deptName || '',
+                    deptId: m.deptId || '',
+                    region: m.region || '',
+                    regionName: m.regionName || '',
                     orderDate: m.orderDate || '',
                     orderDate: m.orderDate || '',
                     designatedConsignee: m.designatedConsignee || '',
                     designatedConsignee: m.designatedConsignee || '',
                     specialTerms: m.specialTerms || '',
                     specialTerms: m.specialTerms || '',
@@ -371,7 +413,7 @@ export default {
         },
         },
         displayLabel(field) {
         displayLabel(field) {
             const m = this.form
             const m = this.form
-            const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopName: '请选择生产厂' }
+            const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopName: '请选择生产厂', regionName: '请选择区域' }
             const val = m[field]
             const val = m[field]
             return val ? String(val) : map[field]
             return val ? String(val) : map[field]
         },
         },
@@ -400,6 +442,8 @@ export default {
                 setSheet('单价中是否已包含包装费', this.yesNoList)
                 setSheet('单价中是否已包含包装费', this.yesNoList)
             } else if (field === 'includesTransportFee') {
             } else if (field === 'includesTransportFee') {
                 setSheet('单价中是否已包含运费', this.yesNoList)
                 setSheet('单价中是否已包含运费', this.yesNoList)
+            } else if (field === 'region') {
+                setSheet('区域', this.regionOptions)
             }
             }
         },
         },
         onSheetConfirm({ value, label }) {
         onSheetConfirm({ value, label }) {
@@ -449,6 +493,7 @@ export default {
                 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
                 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
                 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
                 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
             }
             }
+            if (!this.$refs.productRel.validate()) return false
             const list = Array.isArray(this.newProductLineList) ? this.newProductLineList : []
             const list = Array.isArray(this.newProductLineList) ? this.newProductLineList : []
             if (list.length === 0) {
             if (list.length === 0) {
                 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false
                 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false

@@ -55,51 +55,51 @@
                     </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.thickness" :inputBorder="false" placeholder="请输入厚度" @input="onNonNegativeInput(idx, 'thickness')" @blur="onNonNegativeBlur(idx, 'thickness', 2)" />
+                            <uni-easyinput type="digit" v-model="item.thickness" :inputBorder="false" placeholder="请输入厚度" @input="onNonNegativeInput(idx, 'thickness')" @blur="onNonNegativeBlur(idx, 'thickness', 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.thicknessTolPos" :inputBorder="false"
-                                placeholder="请输入厚度公差上限" @input="onNonNegativeInput(idx, 'thicknessTolPos')" @blur="onNonNegativeBlur(idx, 'thicknessTolPos', 2)" />
+                            <uni-easyinput type="text" v-model="item.thicknessTolPos" :inputBorder="false"
+                                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"
-                                placeholder="请输入厚度公差下限" @input="onNonNegativeInput(idx, 'thicknessTolNeg')" @blur="onNonNegativeBlur(idx, 'thicknessTolNeg', 2)" />
+                            <uni-easyinput type="text" v-model="item.thicknessTolNeg" :inputBorder="false"
+                                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)">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput type="digit" v-model="item.width" :inputBorder="false" placeholder="请输入宽度" @input="onNonNegativeInput(idx, 'width')" @blur="onNonNegativeBlur(idx, 'width', 2)" />
+                            <uni-easyinput type="digit" v-model="item.width" :inputBorder="false" placeholder="请输入宽度" @input="onNonNegativeInput(idx, 'width')" @blur="onNonNegativeBlur(idx, 'width', 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.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差上限" @input="onNonNegativeInput(idx, 'widthTolPos')" @blur="onNonNegativeBlur(idx, 'widthTolPos', 2)" />
+                            <uni-easyinput type="text" 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', 2)" />
+                            <uni-easyinput type="text" 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)">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput type="digit" v-model="item.length" :inputBorder="false" placeholder="请输入长度" @input="onNonNegativeInput(idx, 'length')" @blur="onNonNegativeBlur(idx, 'length', 2)" />
+                            <uni-easyinput type="digit" v-model="item.length" :inputBorder="false" placeholder="请输入长度" @input="onNonNegativeInput(idx, 'length')" @blur="onNonNegativeBlur(idx, 'length', 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.lengthTolPos" :inputBorder="false"
-                                placeholder="请输入长度公差上限" @input="onNonNegativeInput(idx, 'lengthTolPos')" @blur="onNonNegativeBlur(idx, 'lengthTolPos', 2)" />
+                            <uni-easyinput type="text" v-model="item.lengthTolPos" :inputBorder="false"
+                                placeholder="请输入长度公差上限" @input="onNumberInput(idx, 'lengthTolPos')" @blur="onNumberBlur(idx, 'lengthTolPos', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="长度公差下限(mm)">
                     <uni-list-item title="长度公差下限(mm)">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false"
-                                placeholder="请输入长度公差下限" @input="onNonNegativeInput(idx, 'lengthTolNeg')" @blur="onNonNegativeBlur(idx, 'lengthTolNeg', 2)" />
+                            <uni-easyinput type="text" v-model="item.lengthTolNeg" :inputBorder="false"
+                                placeholder="请输入长度公差下限" @input="onNumberInput(idx, 'lengthTolNeg')" @blur="onNumberBlur(idx, 'lengthTolNeg', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="状态">
                     <uni-list-item title="状态">
@@ -109,12 +109,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.quantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'quantity')" @blur="onNonNegativeBlur(idx, 'quantity', 2)" />
+                            <uni-easyinput v-model="item.quantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'quantity')" @blur="onNonNegativeBlur(idx, 'quantity', 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.unitPrice" type="digit" :inputBorder="false" disabled placeholder="请输入销售价格" @input="onNonNegativeInput(idx, 'unitPrice')" @blur="onNonNegativeBlur(idx, 'unitPrice', 2)" />
+                            <uni-easyinput v-model="item.unitPrice" type="digit" :inputBorder="false" disabled placeholder="请输入销售价格" @input="onNonNegativeInput(idx, 'unitPrice')" @blur="onNonNegativeBlur(idx, 'unitPrice', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="不含税金额">
                     <uni-list-item title="不含税金额">
@@ -257,6 +257,110 @@ export default {
     this.recalculateAll()
     this.recalculateAll()
   },
   },
   methods: {
   methods: {
+        onNumberInput(idx, field) {
+            const it = this.items[idx]
+            if (!it) return
+            let v = String(it[field] != null ? it[field] : '')
+            // Allow numbers, decimal point, and negative sign
+            // But since this is a simple input, maybe just allow everything and validate later?
+            // Or better, restrict to valid number characters: 0-9, ., -
+            v = v.replace(/[^0-9.-]/g, '')
+            
+            // Handle multiple dots: keep only the first one
+            const parts = v.split('.')
+            if (parts.length > 2) {
+                v = parts[0] + '.' + parts.slice(1).join('')
+            }
+            
+            // Handle multiple negative signs: keep only at start
+            if (v.indexOf('-') > 0) {
+                 v = v.replace(/-/g, '') // remove all
+                 // Logic to put it back is complex if user types in middle, 
+                 // but standard behavior is usually just stripping invalid ones.
+                 // Let's just strip non-leading minus
+            }
+            // A simpler regex approach for "start with optional minus, then digits/dots" is hard in one replace.
+            // Let's stick to a simple cleanup:
+            
+            // 1. Remove anything that is not digit, dot, or minus
+            v = v.replace(/[^0-9.-]/g, '')
+            
+            // 2. Ensure minus is only at index 0
+            if (v.lastIndexOf('-') > 0) {
+                v = (v.startsWith('-') ? '-' : '') + v.replace(/-/g, '')
+            }
+            
+            // 3. Ensure only one dot
+            const firstDotIndex = v.indexOf('.')
+            if (firstDotIndex !== -1) {
+                const before = v.substring(0, firstDotIndex + 1)
+                const after = v.substring(firstDotIndex + 1).replace(/\./g, '')
+                v = before + after
+            }
+            
+            // 4. If it starts with dot (or -. ), maybe prefix 0? 
+            // -0.5 is valid. .5 is valid (becomes 0.5). -.5 becomes -0.5
+            if (v.startsWith('.')) v = '0' + v
+            if (v.startsWith('-.')) v = '-0' + v.substring(1)
+
+            it[field] = v
+            this.$set(this.items, idx, it)
+        },
+        onNumberBlur(idx, field, digits) {
+            const it = this.items[idx]
+            if (!it) return
+            const raw = it[field]
+            if (raw === '' || raw === null || raw === undefined || raw === '-') {
+                 // if just "-", clear it? or keep it? usually clear or 0.
+                 // If it's optional tolerance, maybe empty string is better than 0 if user cleared it.
+                 // But previously we used 0 for numbers. 
+                 // However, for tolerances, empty might mean "no tolerance specified". 
+                 // Let's check existing logic. onNonNegativeBlur sets to 0 if empty/invalid.
+                 // For tolerance, maybe we want to allow empty?
+                 // The requirement says "两个都有值时，上限 要大于 下限". 
+                 // If I set to 0, then 0 > 0 is false. 
+                 // Let's assume empty is allowed.
+                 // But wait, "number type".
+                 // Let's try to parse.
+                if (raw === '' || raw === null || raw === undefined) {
+                    this.$set(this.items, idx, it)
+                    return
+                }
+            }
+            
+            let num = this.toNumber(raw)
+            if (isNaN(num)) {
+                 // If invalid input, maybe reset to empty or 0?
+                 // Let's set to 0 if it was required, but tolerance might be optional.
+                 // If the user entered garbage, clear it.
+                 it[field] = ''
+            } else {
+                 const rounded = this.round(num, digits)
+                 it[field] = rounded
+            }
+            this.$set(this.items, idx, it)
+        },
+        validate() {
+            for (let i = 0; i < this.items.length; i++) {
+                const it = this.items[i]
+                const check = (pos, neg, label) => {
+                    if (pos !== '' && pos !== null && pos !== undefined &&
+                        neg !== '' && neg !== null && neg !== undefined) {
+                        if (Number(pos) <= Number(neg)) {
+                            return `第${i + 1}行产品：${label}公差上限必须大于下限`
+                        }
+                    }
+                    return null
+                }
+                let err = check(it.thicknessTolPos, it.thicknessTolNeg, '厚度')
+                if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
+                err = check(it.widthTolPos, it.widthTolNeg, '宽度')
+                if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
+                err = check(it.lengthTolPos, it.lengthTolNeg, '长度')
+                if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
+            }
+            return true
+        },
         defaultItem() {
         defaultItem() {
             return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '' }
             return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '' }
         },
         },

@@ -21,6 +21,13 @@
                         <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>
+                <uni-list-item class="select-item" :class="form.stockUpCompanyId ? 'is-filled' : 'is-empty'" clickable
+                    @click="openRelate('stockUpCompanyId')" :rightText="form.stockUpCompanyName || '请选择备货单位'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text class="required">*</text><text>备货单位/人（生产标准）</text></view>
+                    </template>
+                </uni-list-item>
+                
 
 
                 <uni-list-item title="订货日期">
                 <uni-list-item title="订货日期">
                     <template v-slot:footer>
                     <template v-slot:footer>
@@ -39,7 +46,18 @@
 						<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 mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" @change="onProductsChange" :options="productList" />
+                <uni-list-item title="办事处">
+                    <template v-slot:footer>
+                        <uni-easyinput v-model="form.deptName" :inputBorder="false" disabled placeholder="自动获取" />
+                    </template>
+                </uni-list-item>
+                <uni-list-item class="select-item" :class="form.region ? 'is-filled' : 'is-empty'" clickable
+                    @click="openSheet('region')" :rightText="displayLabel('regionName')" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text class="required">*</text><text>区域</text></view>
+                    </template>
+                </uni-list-item>
+                <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 />
@@ -208,10 +226,11 @@ import SingleSelectSheet from '@/components/single-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
 import ProductRel from './productRel.vue'
 import ProductRel from './productRel.vue'
 import CitySelector from '@/components/city-selector/index.vue'
 import CitySelector from '@/components/city-selector/index.vue'
-import { getRetailCodeApi, createContractApi, getCustomerRemarks,getCustomerSpecificQualityRequirements } from '@/api/contract'
+import { getRetailCodeApi, createContractApi, getCustomerRemarks,getCustomerSpecificQualityRequirements, getDeptApi } from '@/api/contract'
 import { getDicByCodes } from '@/utils/dic'
 import { getDicByCodes } from '@/utils/dic'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { workshopQueryApi } from '@/api/devManage'
 import { workshopQueryApi } from '@/api/devManage'
+import { getArea } from '@/api/credit_manage.js'
 
 
 export default {
 export default {
     name: 'AddContractUnplan',
     name: 'AddContractUnplan',
@@ -224,6 +243,8 @@ export default {
                 supplierName: '',
                 supplierName: '',
                 buyer: '',
                 buyer: '',
                 buyerName: '',
                 buyerName: '',
+                stockUpCompanyId: '',
+                stockUpCompanyName: '',
                 orderDate: '',
                 orderDate: '',
                 deliveryDate: '',
                 deliveryDate: '',
                 designatedConsignee: '',
                 designatedConsignee: '',
@@ -242,6 +263,10 @@ export default {
                 destinationLabel: '',
                 destinationLabel: '',
                 workshopIdName: '',
                 workshopIdName: '',
                 workshopId: '',
                 workshopId: '',
+                deptName: '',
+                deptId: '',
+                region: '',
+                regionName: '',
                 remarks: '',
                 remarks: '',
                 component: '',
                 component: '',
                 packaging: '',
                 packaging: '',
@@ -263,12 +288,15 @@ export default {
             productList: [],
             productList: [],
             customerRemarks: [],
             customerRemarks: [],
             defaultRemark: '',
             defaultRemark: '',
+            regionOptions: [],
         }
         }
     },
     },
     created() {
     created() {
         this.loadSuppliers()
         this.loadSuppliers()
         this.loadExtraOptions()
         this.loadExtraOptions()
         this.initCode()
         this.initCode()
+        this.getDept()
+        this.loadRegionOptions()
         this.form.orderDate = this.formatDate(new Date())
         this.form.orderDate = this.formatDate(new Date())
         this.$nextTick(() => {
         this.$nextTick(() => {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
@@ -319,6 +347,24 @@ export default {
         },
         },
     },
     },
     methods: {
     methods: {
+        async loadRegionOptions() {
+            try {
+                const res = await getArea()
+                const list = res.data || []
+                this.regionOptions = (list || []).map(it => ({ label: it.name || '', value: it.id || '' }))
+            } catch (e) {
+                this.regionOptions = []
+            }
+        },
+        // 查询当前人所在办事处
+        getDept() {
+            getDeptApi().then(res => {
+                if (res.code === 200) {
+                    this.form.deptName = res.data.name || ''
+                    this.form.deptId = res.data.id || ''
+                }
+            })
+        },
         getHistory() {
         getHistory() {
             console.log('this.productLineList', this.productLineList[0].productId)
             console.log('this.productLineList', this.productLineList[0].productId)
             if (!this.productLineList.length || !this.productLineList[0].productId) {
             if (!this.productLineList.length || !this.productLineList[0].productId) {
@@ -407,7 +453,7 @@ export default {
         },
         },
         displayLabel(field) {
         displayLabel(field) {
             const m = this.form
             const m = this.form
-            const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopIdName: '请选择生产厂' }
+            const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopIdName: '请选择生产厂', regionName: '请选择区域' }
             const val = m[field]
             const val = m[field]
             return val ? String(val) : map[field]
             return val ? String(val) : map[field]
         },
         },
@@ -452,6 +498,8 @@ export default {
                 setSheet('单价中是否已包含运费', this.yesNoList)
                 setSheet('单价中是否已包含运费', this.yesNoList)
             } else if (field === 'historyRemarks') {
             } else if (field === 'historyRemarks') {
                 setSheet('历史备注', this.customerRemarks)
                 setSheet('历史备注', this.customerRemarks)
+            } else if (field === 'region') {
+                setSheet('区域', this.regionOptions)
             }
             }
         },
         },
         onSheetConfirm({ value, label }) {
         onSheetConfirm({ value, label }) {
@@ -546,6 +594,7 @@ export default {
                 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
                 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
                 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
                 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
             }
             }
+            if (this.$refs.productRel && !this.$refs.productRel.validate()) return false
             const list = Array.isArray(this.productLineList) ? this.productLineList : []
             const list = Array.isArray(this.productLineList) ? this.productLineList : []
             if (list.length === 0) {
             if (list.length === 0) {
                 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false
                 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false

@@ -23,6 +23,10 @@
                     <view class="row"><text class="label">单位</text><text class="value">{{ detail.unit }}</text></view>
                     <view class="row"><text class="label">单位</text><text class="value">{{ detail.unit }}</text></view>
                     <view class="row"><text class="label">生产厂</text><text class="value">{{ detail.workshopName || '-'
                     <view class="row"><text class="label">生产厂</text><text class="value">{{ detail.workshopName || '-'
                     }}</text></view>
                     }}</text></view>
+                    <view class="row"><text class="label">办事处</text><text class="value">{{ detail.deptName || '-'
+                    }}</text></view>
+                    <view class="row"><text class="label">区域</text><text class="value">{{ detail.regionName || '-'
+                    }}</text></view>
                 </view>
                 </view>
 
 
                 <view class="section1">
                 <view class="section1">
@@ -470,6 +474,11 @@ export default {
                 this.detail = {
                 this.detail = {
                     ...this.detail,
                     ...this.detail,
                     ...data,
                     ...data,
+                    stockUpCompanyId: data.stockUpCompanyId || '',
+                    stockUpCompanyName: data.stockUpCompanyName || '',
+                    deptName: data.deptName || '',
+                    region: data.region || '',
+                    regionName: data.regionName || '',
                     includesPackagingFeeName, includesTransportFeeName,
                     includesPackagingFeeName, includesTransportFeeName,
                     destinationId: data.provinceId && data.cityId && data.districtId ? [data.provinceId, data.cityId, data.districtId] : '',
                     destinationId: data.provinceId && data.cityId && data.districtId ? [data.provinceId, data.cityId, data.districtId] : '',
                     destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '',
                     destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '',

@@ -21,7 +21,12 @@
                         <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>
-
+                <uni-list-item class="select-item" :class="form.stockUpCompanyId ? 'is-filled' : 'is-empty'" clickable
+                    @click="openRelate('stockUpCompanyId')" :rightText="form.stockUpCompanyName || '请选择备货单位'" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text class="required">*</text><text>备货单位/人（生产标准）</text></view>
+                    </template>
+                </uni-list-item>
                 <uni-list-item class="select-item" :class="form.workshopId ? 'is-filled' : 'is-empty'" clickable
                 <uni-list-item class="select-item" :class="form.workshopId ? 'is-filled' : 'is-empty'" clickable
                     @click="openSheet('workshopId')" :rightText="form.workshopName || '请选择生产厂'" showArrow>
                     @click="openSheet('workshopId')" :rightText="form.workshopName || '请选择生产厂'" showArrow>
                     <template v-slot:body>
                     <template v-slot:body>
@@ -40,8 +45,18 @@
                         <uni-easyinput v-model="form.unit" :inputBorder="false" disabled />
                         <uni-easyinput v-model="form.unit" :inputBorder="false" disabled />
                     </template>
                     </template>
                 </uni-list-item>
                 </uni-list-item>
-
-                <ProductRel mode="add" :deliveryDateBase="form.deliveryDate" :deliveryDate="form.orderDate" :list="productLineList" @change="onProductsChange" :options="productList" />
+                <uni-list-item title="办事处">
+                    <template v-slot:footer>
+                        <uni-easyinput v-model="form.deptName" :inputBorder="false" disabled placeholder="自动获取" />
+                    </template>
+                </uni-list-item>
+                <uni-list-item class="select-item" :class="form.region ? 'is-filled' : 'is-empty'" clickable
+                    @click="openSheet('region')" :rightText="displayLabel('regionName')" showArrow>
+                    <template v-slot:body>
+                        <view class="item-title"><text class="required">*</text><text>区域</text></view>
+                    </template>
+                </uni-list-item>
+                <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>
@@ -195,10 +210,11 @@ import SingleSelectSheet from '@/components/single-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
 import RelateSelectSheet from '@/components/relate-select/index.vue'
 import ProductRel from './productRel.vue'
 import ProductRel from './productRel.vue'
 import CitySelector from '@/components/city-selector/index.vue'
 import CitySelector from '@/components/city-selector/index.vue'
-import { getContractApi, updateContractApi } from '@/api/contract'
+import { getContractApi, updateContractApi, getDeptApi } from '@/api/contract'
 import { getDicByCodes } from '@/utils/dic'
 import { getDicByCodes } from '@/utils/dic'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { formatCurrencyToChinese } from '@/utils/common'
 import { workshopQueryApi } from '@/api/devManage'
 import { workshopQueryApi } from '@/api/devManage'
+import { getArea } from '@/api/credit_manage.js'
 export default {
 export default {
     name: 'ModifyContractUnplan',
     name: 'ModifyContractUnplan',
     components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector },
     components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector },
@@ -212,8 +228,14 @@ export default {
                 supplierName: '',
                 supplierName: '',
                 buyer: '',
                 buyer: '',
                 buyerName: '',
                 buyerName: '',
+                stockUpCompanyId: '',
+                stockUpCompanyName: '',
                 workshopId: '',
                 workshopId: '',
                 workshopName: '',
                 workshopName: '',
+                deptName: '',
+                deptId: '',
+                region: '',
+                regionName: '',
                 orderDate: '',
                 orderDate: '',
                 deliveryDate: '',
                 deliveryDate: '',
                 designatedConsignee: '',
                 designatedConsignee: '',
@@ -254,7 +276,8 @@ export default {
             totalAmountIncludingTax: 0,
             totalAmountIncludingTax: 0,
             productLineList: [],
             productLineList: [],
             newProductLineList: [],
             newProductLineList: [],
-            productList: []
+            productList: [],
+            regionOptions: [],
         }
         }
     },
     },
     onLoad(query) {
     onLoad(query) {
@@ -264,6 +287,7 @@ export default {
         this.loadSuppliers()
         this.loadSuppliers()
         this.loadExtraOptions()
         this.loadExtraOptions()
         this.loadDetail()
         this.loadDetail()
+        this.loadRegionOptions()
         this.$nextTick(() => {
         this.$nextTick(() => {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
             if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
                 this.initDestinationLabel()
                 this.initDestinationLabel()
@@ -271,6 +295,15 @@ export default {
         })
         })
     },
     },
     methods: {
     methods: {
+        async loadRegionOptions() {
+            try {
+                const res = await getArea()
+                const list = res.data || []
+                this.regionOptions = (list || []).map(it => ({ label: it.name || '', value: it.id || '' }))
+            } catch (e) {
+                this.regionOptions = []
+            }
+        },
         async loadDetail() {
         async loadDetail() {
             if (!this.id) return
             if (!this.id) return
             try {
             try {
@@ -287,6 +320,12 @@ export default {
                     supplierName: m.supplierName || '',
                     supplierName: m.supplierName || '',
                     buyer: m.buyer || (m.customer && m.customer.id) || '',
                     buyer: m.buyer || (m.customer && m.customer.id) || '',
                     buyerName: m.buyerName || (m.customer && m.customer.name) || '',
                     buyerName: m.buyerName || (m.customer && m.customer.name) || '',
+                    stockUpCompanyId: m.stockUpCompanyId || '',
+                    stockUpCompanyName: m.stockUpCompanyName || '',
+                    deptName: m.deptName || '',
+                    deptId: m.deptId || '',
+                    region: m.region || '',
+                    regionName: m.regionName || '',
                     orderDate: m.orderDate || '',
                     orderDate: m.orderDate || '',
                     designatedConsignee: m.designatedConsignee || '',
                     designatedConsignee: m.designatedConsignee || '',
                     specialTerms: m.specialTerms || '',
                     specialTerms: m.specialTerms || '',
@@ -371,7 +410,7 @@ export default {
         },
         },
         displayLabel(field) {
         displayLabel(field) {
             const m = this.form
             const m = this.form
-            const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopName: '请选择生产厂' }
+            const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopName: '请选择生产厂', regionName: '请选择区域' }
             const val = m[field]
             const val = m[field]
             return val ? String(val) : map[field]
             return val ? String(val) : map[field]
         },
         },
@@ -400,6 +439,8 @@ export default {
                 setSheet('单价中是否已包含包装费', this.yesNoList)
                 setSheet('单价中是否已包含包装费', this.yesNoList)
             } else if (field === 'includesTransportFee') {
             } else if (field === 'includesTransportFee') {
                 setSheet('单价中是否已包含运费', this.yesNoList)
                 setSheet('单价中是否已包含运费', this.yesNoList)
+            } else if (field === 'region') {
+                setSheet('区域', this.regionOptions)
             }
             }
         },
         },
         onSheetConfirm({ value, label }) {
         onSheetConfirm({ value, label }) {
@@ -439,9 +480,11 @@ export default {
            { key: 'code', label: '编号' },
            { key: 'code', label: '编号' },
                 { key: 'supplier', label: '供方' },
                 { key: 'supplier', label: '供方' },
                 { key: 'buyer', label: '需方' },
                 { key: 'buyer', label: '需方' },
+                { key: 'stockUpCompanyId', label: '备货单位/人（生产标准）' },
                 { key: 'orderDate', label: '订货日期' },
                 { key: 'orderDate', label: '订货日期' },
                 { key: 'unit', label: '单位' },
                 { key: 'unit', label: '单位' },
                 { key: 'workshopId', label: '生产厂' },
                 { key: 'workshopId', label: '生产厂' },
+                { key: 'region', label: '区域' },
                 { key: 'specialTerms', label: '特别条款要求' },
                 { key: 'specialTerms', label: '特别条款要求' },
             ]
             ]
             for (const it of checks) {
             for (const it of checks) {
@@ -449,6 +492,7 @@ export default {
                 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
                 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
                 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
                 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
             }
             }
+            if (this.$refs.productRel && !this.$refs.productRel.validate()) return false
             const list = Array.isArray(this.newProductLineList) ? this.newProductLineList : []
             const list = Array.isArray(this.newProductLineList) ? this.newProductLineList : []
             if (list.length === 0) {
             if (list.length === 0) {
                 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false
                 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false
@@ -752,4 +796,4 @@ export default {
                 }
                 }
             }
             }
                
                
-</style>
+</style>

@@ -55,51 +55,51 @@
                     </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.thickness" :inputBorder="false" placeholder="请输入厚度" @input="onNonNegativeInput(idx, 'thickness')" @blur="onNonNegativeBlur(idx, 'thickness', 2)" />
+                            <uni-easyinput type="digit" v-model="item.thickness" :inputBorder="false" placeholder="请输入厚度" @input="onNonNegativeInput(idx, 'thickness')" @blur="onNonNegativeBlur(idx, 'thickness', 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.thicknessTolPos" :inputBorder="false"
-                                placeholder="请输入厚度公差上限" @input="onNonNegativeInput(idx, 'thicknessTolPos')" @blur="onNonNegativeBlur(idx, 'thicknessTolPos', 2)" />
+                            <uni-easyinput type="text" v-model="item.thicknessTolPos" :inputBorder="false"
+                                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"
-                                placeholder="请输入厚度公差下限" @input="onNonNegativeInput(idx, 'thicknessTolNeg')" @blur="onNonNegativeBlur(idx, 'thicknessTolNeg', 2)" />
+                            <uni-easyinput type="text" v-model="item.thicknessTolNeg" :inputBorder="false"
+                                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)">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput type="digit" v-model="item.width" :inputBorder="false" placeholder="请输入宽度" @input="onNonNegativeInput(idx, 'width')" @blur="onNonNegativeBlur(idx, 'width', 2)" />
+                            <uni-easyinput type="digit" v-model="item.width" :inputBorder="false" placeholder="请输入宽度" @input="onNonNegativeInput(idx, 'width')" @blur="onNonNegativeBlur(idx, 'width', 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.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差上限" @input="onNonNegativeInput(idx, 'widthTolPos')" @blur="onNonNegativeBlur(idx, 'widthTolPos', 2)" />
+                            <uni-easyinput type="text" 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', 2)" />
+                            <uni-easyinput type="text" 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)">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput type="digit" v-model="item.length" :inputBorder="false" placeholder="请输入长度" @input="onNonNegativeInput(idx, 'length')" @blur="onNonNegativeBlur(idx, 'length', 2)" />
+                            <uni-easyinput type="digit" v-model="item.length" :inputBorder="false" placeholder="请输入长度" @input="onNonNegativeInput(idx, 'length')" @blur="onNonNegativeBlur(idx, 'length', 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.lengthTolPos" :inputBorder="false"
-                                placeholder="请输入长度公差上限" @input="onNonNegativeInput(idx, 'lengthTolPos')" @blur="onNonNegativeBlur(idx, 'lengthTolPos', 2)" />
+                            <uni-easyinput type="text" v-model="item.lengthTolPos" :inputBorder="false"
+                                placeholder="请输入长度公差上限" @input="onNumberInput(idx, 'lengthTolPos')" @blur="onNumberBlur(idx, 'lengthTolPos', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="长度公差下限(mm)">
                     <uni-list-item title="长度公差下限(mm)">
                         <template v-slot:footer>
                         <template v-slot:footer>
-                            <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false"
-                                placeholder="请输入长度公差下限" @input="onNonNegativeInput(idx, 'lengthTolNeg')" @blur="onNonNegativeBlur(idx, 'lengthTolNeg', 2)" />
+                            <uni-easyinput type="text" v-model="item.lengthTolNeg" :inputBorder="false"
+                                placeholder="请输入长度公差下限" @input="onNumberInput(idx, 'lengthTolNeg')" @blur="onNumberBlur(idx, 'lengthTolNeg', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="状态">
                     <uni-list-item title="状态">
@@ -109,12 +109,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.quantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'quantity')" @blur="onNonNegativeBlur(idx, 'quantity', 2)" />
+                            <uni-easyinput v-model="item.quantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'quantity')" @blur="onNonNegativeBlur(idx, 'quantity', 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.unitPrice" type="digit" :inputBorder="false" placeholder="请输入销售价格" @input="onNonNegativeInput(idx, 'unitPrice')" @blur="onNonNegativeBlur(idx, 'unitPrice', 2)" />
+                            <uni-easyinput v-model="item.unitPrice" type="digit" :inputBorder="false" placeholder="请输入销售价格" @input="onNonNegativeInput(idx, 'unitPrice')" @blur="onNonNegativeBlur(idx, 'unitPrice', 9)" />
                         </template>
                         </template>
                     </uni-list-item>
                     </uni-list-item>
                     <uni-list-item title="不含税金额">
                     <uni-list-item title="不含税金额">
@@ -297,6 +297,52 @@ export default {
             this.$set(this.items, idx, it)
             this.$set(this.items, idx, it)
             if (field === 'quantity' || field === 'unitPrice') this.recalculate(idx)
             if (field === 'quantity' || field === 'unitPrice') this.recalculate(idx)
         },
         },
+        onNumberInput(idx, field) {
+            const it = this.items[idx]
+            if (!it) return
+            let v = String(it[field] != null ? it[field] : '')
+            v = v.replace(/[^0-9.\-]/g, '')
+            v = v.replace(/(\..*)\./g, '$1')
+            v = v.replace(/(?!^)-/g, '')
+            if (v.startsWith('.')) v = '0' + v
+            if (v.startsWith('-.')) v = '-0' + v.slice(1)
+            it[field] = v
+            this.$set(this.items, idx, it)
+        },
+        onNumberBlur(idx, field, digits) {
+            const it = this.items[idx]
+            if (!it) return
+            const raw = it[field]
+            if (raw === '' || raw === null || raw === undefined) {
+                this.$set(this.items, idx, it)
+                return
+            }
+            let num = this.toNumber(raw)
+            const rounded = this.round(num, digits)
+            it[field] = rounded
+            this.$set(this.items, idx, it)
+        },
+        validate() {
+            for (let i = 0; i < this.items.length; i++) {
+                const it = this.items[i]
+                const check = (pos, neg, label) => {
+                    if (pos !== '' && pos !== null && pos !== undefined &&
+                        neg !== '' && neg !== null && neg !== undefined) {
+                        if (Number(pos) <= Number(neg)) {
+                            return `第${i + 1}行产品：${label}公差上限必须大于下限`
+                        }
+                    }
+                    return null
+                }
+                let err = check(it.thicknessTolPos, it.thicknessTolNeg, '厚度')
+                if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
+                err = check(it.widthTolPos, it.widthTolNeg, '宽度')
+                if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
+                err = check(it.lengthTolPos, it.lengthTolNeg, '长度')
+                if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
+            }
+            return true
+        },
         formatCurrency(val) {
         formatCurrency(val) {
             if (val == null || val === '') return ''
             if (val == null || val === '') return ''
             const num = Number(val)
             const num = Number(val)

@@ -14,26 +14,41 @@
           </template>
           </template>
         </uni-list-item>
         </uni-list-item>
 
 
+        <uni-list-item title="办事处">
+          <template v-slot:body>
+            <view class="item-title"><text class="required">*</text><text>办事处</text></view>
+          </template>
+          <template v-slot:footer>
+            <view class="readonly-text">{{ form.deptName }}</view>
+          </template>
+        </uni-list-item>
+
         <uni-list-item class="select-item" :class="form.region ? 'is-filled' : 'is-empty'" clickable
         <uni-list-item class="select-item" :class="form.region ? 'is-filled' : 'is-empty'" clickable
           @click="openSheet('region')" :rightText="displayLabel('regionName')" showArrow>
           @click="openSheet('region')" :rightText="displayLabel('regionName')" showArrow>
           <template v-slot:body>
           <template v-slot:body>
-            <view class="item-title"><text>区域</text></view>
+            <view class="item-title"><text class="required">*</text><text>区域</text></view>
           </template>
           </template>
         </uni-list-item>
         </uni-list-item>
-        <uni-list-item title="客户简称">
+        <uni-list-item class="select-item" :class="form.customerShortName ? 'is-filled' : 'is-empty'">
+          <template v-slot:body>
+            <view class="item-title"><text class="required">*</text><text>简写名称</text></view>
+          </template>
           <template v-slot:footer>
           <template v-slot:footer>
-            <uni-easyinput v-model="form.customerShortName" placeholder="请输入客户简称" :inputBorder="false" />
+            <uni-easyinput v-model="form.customerShortName" placeholder="请输入简写名称" :inputBorder="false" />
           </template>
           </template>
         </uni-list-item>
         </uni-list-item>
 
 
         <uni-list-item class="select-item" :class="form.enterpriseType ? 'is-filled' : 'is-empty'" clickable
         <uni-list-item class="select-item" :class="form.enterpriseType ? 'is-filled' : 'is-empty'" clickable
           @click="openSheet('enterpriseType')" :rightText="displayLabel('enterpriseTypeName')" showArrow>
           @click="openSheet('enterpriseType')" :rightText="displayLabel('enterpriseTypeName')" showArrow>
           <template v-slot:body>
           <template v-slot:body>
-            <view class="item-title"><text>企业类型</text></view>
+            <view class="item-title"><text class="required">*</text><text>企业类型</text></view>
           </template>
           </template>
         </uni-list-item>
         </uni-list-item>
 
 
         <uni-list-item class="mgb10" title="登记日期">
         <uni-list-item class="mgb10" title="登记日期">
+          <template v-slot:body>
+            <view class="item-title"><text class="required">*</text><text>登记日期</text></view>
+          </template>
           <template v-slot:footer>
           <template v-slot:footer>
             <uni-datetime-picker type="date" v-model="form.registerDate" />
             <uni-datetime-picker type="date" v-model="form.registerDate" />
           </template>
           </template>
@@ -251,7 +266,7 @@
         </uni-list-item>
         </uni-list-item>
         <uni-list-item class="amount-item">
         <uni-list-item class="amount-item">
           <template v-slot:body>
           <template v-slot:body>
-            <view class="item-title"><text>授信额度</text></view>
+            <view class="item-title"><text class="required">*</text><text>授信额度</text></view>
           </template>
           </template>
           <template v-slot:footer>
           <template v-slot:footer>
             <view class="amount-row">
             <view class="amount-row">
@@ -261,6 +276,9 @@
           </template>
           </template>
         </uni-list-item>
         </uni-list-item>
         <uni-list-item title="结算期限">
         <uni-list-item title="结算期限">
+          <template v-slot:body>
+            <view class="item-title"><text class="required">*</text><text>结算期限</text></view>
+          </template>
           <template v-slot:footer>
           <template v-slot:footer>
             <uni-easyinput v-model="form.settlementPeriod" placeholder="请输入结算期限" :inputBorder="false" />
             <uni-easyinput v-model="form.settlementPeriod" placeholder="请输入结算期限" :inputBorder="false" />
           </template>
           </template>
@@ -309,7 +327,8 @@
       @confirm="onSheetConfirm" />
       @confirm="onSheetConfirm" />
     <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" :source-extra="{ source: 'CUSTOMER_CREDIT' }" @confirm="onRelateConfirm" />
+      :selectedKeys.sync="relate.selectedKeys" :source-extra="{ source: 'CUSTOMER_CREDIT' }"
+      @confirm="onRelateConfirm" />
   </view>
   </view>
 
 
 </template>
 </template>
@@ -320,6 +339,7 @@ import RelateSelectSheet from '@/components/relate-select/index.vue'
 import { generateCreditCode, getAllUser, getDeptUser, createApi, getArea } from '@/api/credit_manage.js'
 import { generateCreditCode, getAllUser, getDeptUser, createApi, getArea } from '@/api/credit_manage.js'
 import { getDicByCodeApi } from '@/api/base.js'
 import { getDicByCodeApi } from '@/api/base.js'
 import CorePersonnel from './corePersonnel.vue'
 import CorePersonnel from './corePersonnel.vue'
+import { getDeptApi } from '@/api/contract'
 
 
 export default {
 export default {
   name: 'CreditManageAdd',
   name: 'CreditManageAdd',
@@ -379,6 +399,8 @@ export default {
         mainIndustry: '',
         mainIndustry: '',
         annualMaterialOverview: '',
         annualMaterialOverview: '',
         corePersonnelList: [],
         corePersonnelList: [],
+        deptName: '',
+        deptId: '',
       },
       },
       sheet: { visible: false, title: '请选择', field: '', options: [], value: '' },
       sheet: { 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: '' },
@@ -391,6 +413,7 @@ export default {
     }
     }
   },
   },
   created() {
   created() {
+    this.getDept()
     this.loadSerialNumber()
     this.loadSerialNumber()
     this.loadRegionOptions()
     this.loadRegionOptions()
     this.loadEnterpriseTypeOptions()
     this.loadEnterpriseTypeOptions()
@@ -401,6 +424,15 @@ export default {
     this.loadGenderOptions()
     this.loadGenderOptions()
   },
   },
   methods: {
   methods: {
+    // 查询当前人所在办事处
+    getDept() {
+      getDeptApi().then(res => {
+        if (res.code === 200) {
+          this.form.deptName = res.data.name || ''
+          this.form.deptId = res.data.id || ''
+        }
+      })
+    },
     async loadSerialNumber() {
     async loadSerialNumber() {
       try {
       try {
         const res = await generateCreditCode()
         const res = await generateCreditCode()
@@ -428,13 +460,13 @@ export default {
       if (field === 'region') {
       if (field === 'region') {
         setSheet('区域', this.regionOptions)
         setSheet('区域', this.regionOptions)
       } else
       } else
-      if (field === 'enterpriseType') {
-        setSheet('企业类型', this.enterpriseTypeOptions)
-      } else if (field === 'suggestedCategory') {
-        setSheet('建议客户分类', this.categoryOptions)
-      } else if (field === 'investigator') {
-        setSheet('调查人', this.investigatorOptions)
-      }
+        if (field === 'enterpriseType') {
+          setSheet('企业类型', this.enterpriseTypeOptions)
+        } else if (field === 'suggestedCategory') {
+          setSheet('建议客户分类', this.categoryOptions)
+        } else if (field === 'investigator') {
+          setSheet('调查人', this.investigatorOptions)
+        }
     },
     },
     onSheetConfirm({ value, label }) {
     onSheetConfirm({ value, label }) {
       const field = this.sheet.field
       const field = this.sheet.field
@@ -478,12 +510,21 @@ export default {
     validateRequired() {
     validateRequired() {
       const checks = [
       const checks = [
         { key: 'serialNumber', label: '编号' },
         { key: 'serialNumber', label: '编号' },
-        { key: 'companyId', label: '单位名称' }
+        { key: 'deptId', label: '办事处' },
+        { key: 'region', label: '区域' },
+        { key: 'customerShortName', label: '简写名称' },
+        { key: 'enterpriseType', label: '企业类型' },
+        { key: 'registerDate', label: '登记日期' },
+        { key: 'companyId', label: '单位名称' },
+        { key: 'creditLimit', label: '授信额度' },
+        { key: 'settlementPeriod', label: '结算期限' }
       ]
       ]
       for (const it of checks) {
       for (const it of checks) {
         const val = this.form[it.key]
         const val = this.form[it.key]
         if (val === undefined || val === null || String(val).trim() === '') {
         if (val === undefined || val === null || String(val).trim() === '') {
-          uni.showToast({ title: `请先选择${it.label}`, icon: 'none' })
+          const isInput = ['customerShortName', 'settlementPeriod', 'creditLimit'].includes(it.key);
+          const verb = isInput ? '输入' : '选择';
+          uni.showToast({ title: `请先${verb}${it.label}`, icon: 'none' })
           return false
           return false
         }
         }
       }
       }
@@ -558,7 +599,7 @@ export default {
     },
     },
     async onSubmit() {
     async onSubmit() {
       if (!this.validateRequired()) return
       if (!this.validateRequired()) return
-      const payload = { 
+      const payload = {
         ...this.form,
         ...this.form,
         status: 'AUDIT'
         status: 'AUDIT'
       }
       }
@@ -573,6 +614,7 @@ export default {
       delete payload.suggestedCategoryName
       delete payload.suggestedCategoryName
       delete payload.companyIdName
       delete payload.companyIdName
       delete payload.investigatorName
       delete payload.investigatorName
+      delete payload.deptName
       try {
       try {
         await createApi(payload)
         await createApi(payload)
         uni.showToast({ title: '提交成功', icon: 'success' })
         uni.showToast({ title: '提交成功', icon: 'success' })
@@ -760,4 +802,15 @@ export default {
     }
     }
   }
   }
 }
 }
+
+
+/* 只读文本样式 */
+.readonly-text {
+  color: rgba(0, 0, 0, 0.9);
+  font-size: 32rpx;
+  line-height: 48rpx;
+  text-align: right;
+  white-space: pre-wrap;
+  word-break: break-all;
+}
 </style>
 </style>

@@ -13,26 +13,41 @@
           </template>
           </template>
         </uni-list-item>
         </uni-list-item>
 
 
+        <uni-list-item title="办事处">
+          <template v-slot:body>
+            <view class="item-title"><text class="required">*</text><text>办事处</text></view>
+          </template>
+          <template v-slot:footer>
+            <view class="readonly-text">{{ form.deptName }}</view>
+          </template>
+        </uni-list-item>
+
         <uni-list-item class="select-item" :class="form.region ? 'is-filled' : 'is-empty'" clickable
         <uni-list-item class="select-item" :class="form.region ? 'is-filled' : 'is-empty'" clickable
           @click="openSheet('region')" :rightText="displayLabel('regionName')" showArrow>
           @click="openSheet('region')" :rightText="displayLabel('regionName')" showArrow>
           <template v-slot:body>
           <template v-slot:body>
-            <view class="item-title"><text>区域</text></view>
+            <view class="item-title"><text class="required">*</text><text>区域</text></view>
           </template>
           </template>
         </uni-list-item>
         </uni-list-item>
-        <uni-list-item title="客户简称">
+        <uni-list-item class="select-item" :class="form.customerShortName ? 'is-filled' : 'is-empty'">
+          <template v-slot:body>
+            <view class="item-title"><text class="required">*</text><text>简写名称</text></view>
+          </template>
           <template v-slot:footer>
           <template v-slot:footer>
-            <uni-easyinput v-model="form.customerShortName" placeholder="请输入客户简称" :inputBorder="false" />
+            <uni-easyinput v-model="form.customerShortName" placeholder="请输入简写名称" :inputBorder="false" />
           </template>
           </template>
         </uni-list-item>
         </uni-list-item>
 
 
         <uni-list-item class="select-item" :class="form.enterpriseType ? 'is-filled' : 'is-empty'" clickable
         <uni-list-item class="select-item" :class="form.enterpriseType ? 'is-filled' : 'is-empty'" clickable
           @click="openSheet('enterpriseType')" :rightText="displayLabel('enterpriseTypeName')" showArrow>
           @click="openSheet('enterpriseType')" :rightText="displayLabel('enterpriseTypeName')" showArrow>
           <template v-slot:body>
           <template v-slot:body>
-            <view class="item-title"><text>企业类型</text></view>
+            <view class="item-title"><text class="required">*</text><text>企业类型</text></view>
           </template>
           </template>
         </uni-list-item>
         </uni-list-item>
 
 
         <uni-list-item class="mgb10" title="登记日期">
         <uni-list-item class="mgb10" title="登记日期">
+          <template v-slot:body>
+            <view class="item-title"><text class="required">*</text><text>登记日期</text></view>
+          </template>
           <template v-slot:footer>
           <template v-slot:footer>
             <uni-datetime-picker type="date" v-model="form.registerDate" />
             <uni-datetime-picker type="date" v-model="form.registerDate" />
           </template>
           </template>
@@ -250,7 +265,7 @@
         </uni-list-item>
         </uni-list-item>
         <uni-list-item class="amount-item">
         <uni-list-item class="amount-item">
           <template v-slot:body>
           <template v-slot:body>
-            <view class="item-title"><text>授信额度</text></view>
+            <view class="item-title"><text class="required">*</text><text>授信额度</text></view>
           </template>
           </template>
           <template v-slot:footer>
           <template v-slot:footer>
             <view class="amount-row">
             <view class="amount-row">
@@ -260,6 +275,9 @@
           </template>
           </template>
         </uni-list-item>
         </uni-list-item>
         <uni-list-item title="结算期限">
         <uni-list-item title="结算期限">
+          <template v-slot:body>
+            <view class="item-title"><text class="required">*</text><text>结算期限</text></view>
+          </template>
           <template v-slot:footer>
           <template v-slot:footer>
             <uni-easyinput v-model="form.settlementPeriod" placeholder="请输入结算期限" :inputBorder="false" />
             <uni-easyinput v-model="form.settlementPeriod" placeholder="请输入结算期限" :inputBorder="false" />
           </template>
           </template>
@@ -506,12 +524,21 @@ export default {
     validateRequired() {
     validateRequired() {
       const checks = [
       const checks = [
         { key: 'serialNumber', label: '编号' },
         { key: 'serialNumber', label: '编号' },
-        { key: 'companyId', label: '单位名称' }
+        { key: 'deptName', label: '办事处' },
+        { key: 'region', label: '区域' },
+        { key: 'customerShortName', label: '简写名称' },
+        { key: 'enterpriseType', label: '企业类型' },
+        { key: 'registerDate', label: '登记日期' },
+        { key: 'companyId', label: '单位名称' },
+        { key: 'creditLimit', label: '授信额度' },
+        { key: 'settlementPeriod', label: '结算期限' }
       ]
       ]
       for (const it of checks) {
       for (const it of checks) {
         const val = this.form[it.key]
         const val = this.form[it.key]
         if (val === undefined || val === null || String(val).trim() === '') {
         if (val === undefined || val === null || String(val).trim() === '') {
-          uni.showToast({ title: `请先选择${it.label}`, icon: 'none' })
+          const isInput = ['customerShortName', 'settlementPeriod', 'creditLimit'].includes(it.key);
+          const verb = isInput ? '输入' : '选择';
+          uni.showToast({ title: `请先${verb}${it.label}`, icon: 'none' })
           return false
           return false
         }
         }
       }
       }
@@ -616,6 +643,7 @@ export default {
   padding-bottom: calc(32rpx + env(safe-area-inset-bottom));
   padding-bottom: calc(32rpx + env(safe-area-inset-bottom));
   background: #fff;
   background: #fff;
   box-shadow: 0 -8rpx 24rpx rgba(0, 0, 0, 0.06);
   box-shadow: 0 -8rpx 24rpx rgba(0, 0, 0, 0.06);
+  z-index: 10;
 
 
   .btn {
   .btn {
     height: 80rpx;
     height: 80rpx;
@@ -758,4 +786,13 @@ export default {
     }
     }
   }
   }
 }
 }
+/* 只读文本样式 */
+.readonly-text {
+  color: rgba(0, 0, 0, 0.9);
+  font-size: 32rpx;
+  line-height: 48rpx;
+  text-align: right;
+  white-space: pre-wrap;
+  word-break: break-all;
+}
 </style>
 </style>

@@ -6,8 +6,9 @@
           <text class="row company">{{ form.companyName }}</text>
           <text class="row company">{{ form.companyName }}</text>
           <view :class="['status', `status_${form.status}`]" />
           <view :class="['status', `status_${form.status}`]" />
           <view class="row"><text class="label">编号</text><text class="value">{{ form.serialNumber }}</text></view>
           <view class="row"><text class="label">编号</text><text class="value">{{ form.serialNumber }}</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.regionName }}</text></view>
           <view class="row"><text class="label">区域</text><text class="value">{{ form.regionName }}</text></view>
-          <view class="row"><text class="label">客户简称</text><text class="value">{{ form.customerShortName }}</text>
+          <view class="row"><text class="label">简写名称</text><text class="value">{{ form.customerShortName }}</text>
           </view>
           </view>
           <view class="row"><text class="label">企业类型</text><text class="value">{{ getDicName('ENTERPRISE_TYPE',
           <view class="row"><text class="label">企业类型</text><text class="value">{{ getDicName('ENTERPRISE_TYPE',
             form.enterpriseType, enterpriseTypeOptions) }}</text></view>
             form.enterpriseType, enterpriseTypeOptions) }}</text></view>

@@ -13,26 +13,40 @@
           </template>
           </template>
         </uni-list-item>
         </uni-list-item>
 
 
+        <uni-list-item title="办事处">
+          <template v-slot:body>
+            <view class="item-title"><text class="required">*</text><text>办事处</text></view>
+          </template>
+          <template v-slot:footer>
+            <view class="readonly-text">{{ form.deptName }}</view>
+          </template>
+        </uni-list-item>
         <uni-list-item class="select-item" :class="form.region ? 'is-filled' : 'is-empty'" clickable
         <uni-list-item class="select-item" :class="form.region ? 'is-filled' : 'is-empty'" clickable
           @click="openSheet('region')" :rightText="displayLabel('regionName')" showArrow>
           @click="openSheet('region')" :rightText="displayLabel('regionName')" showArrow>
           <template v-slot:body>
           <template v-slot:body>
-            <view class="item-title"><text>区域</text></view>
+            <view class="item-title"><text class="required">*</text><text>区域</text></view>
           </template>
           </template>
         </uni-list-item>
         </uni-list-item>
-        <uni-list-item title="客户简称">
+        <uni-list-item class="select-item" :class="form.customerShortName ? 'is-filled' : 'is-empty'">
+          <template v-slot:body>
+            <view class="item-title"><text class="required">*</text><text>简写名称</text></view>
+          </template>
           <template v-slot:footer>
           <template v-slot:footer>
-            <uni-easyinput v-model="form.customerShortName" placeholder="请输入客户简称" :inputBorder="false" />
+            <uni-easyinput v-model="form.customerShortName" placeholder="请输入简写名称" :inputBorder="false" />
           </template>
           </template>
         </uni-list-item>
         </uni-list-item>
 
 
         <uni-list-item class="select-item" :class="form.enterpriseType ? 'is-filled' : 'is-empty'" clickable
         <uni-list-item class="select-item" :class="form.enterpriseType ? 'is-filled' : 'is-empty'" clickable
           @click="openSheet('enterpriseType')" :rightText="displayLabel('enterpriseTypeName')" showArrow>
           @click="openSheet('enterpriseType')" :rightText="displayLabel('enterpriseTypeName')" showArrow>
           <template v-slot:body>
           <template v-slot:body>
-            <view class="item-title"><text>企业类型</text></view>
+            <view class="item-title"><text class="required">*</text><text>企业类型</text></view>
           </template>
           </template>
         </uni-list-item>
         </uni-list-item>
 
 
         <uni-list-item class="mgb10" title="登记日期">
         <uni-list-item class="mgb10" title="登记日期">
+          <template v-slot:body>
+            <view class="item-title"><text class="required">*</text><text>登记日期</text></view>
+          </template>
           <template v-slot:footer>
           <template v-slot:footer>
             <uni-datetime-picker type="date" v-model="form.registerDate" />
             <uni-datetime-picker type="date" v-model="form.registerDate" />
           </template>
           </template>
@@ -250,7 +264,7 @@
         </uni-list-item>
         </uni-list-item>
         <uni-list-item class="amount-item">
         <uni-list-item class="amount-item">
           <template v-slot:body>
           <template v-slot:body>
-            <view class="item-title"><text>授信额度</text></view>
+            <view class="item-title"><text class="required">*</text><text>授信额度</text></view>
           </template>
           </template>
           <template v-slot:footer>
           <template v-slot:footer>
             <view class="amount-row">
             <view class="amount-row">
@@ -260,6 +274,9 @@
           </template>
           </template>
         </uni-list-item>
         </uni-list-item>
         <uni-list-item title="结算期限">
         <uni-list-item title="结算期限">
+          <template v-slot:body>
+            <view class="item-title"><text class="required">*</text><text>结算期限</text></view>
+          </template>
           <template v-slot:footer>
           <template v-slot:footer>
             <uni-easyinput v-model="form.settlementPeriod" placeholder="请输入结算期限" :inputBorder="false" />
             <uni-easyinput v-model="form.settlementPeriod" placeholder="请输入结算期限" :inputBorder="false" />
           </template>
           </template>
@@ -506,12 +523,21 @@ export default {
     validateRequired() {
     validateRequired() {
       const checks = [
       const checks = [
         { key: 'serialNumber', label: '编号' },
         { key: 'serialNumber', label: '编号' },
-        { key: 'companyId', label: '单位名称' }
+        { key: 'deptName', label: '办事处' },
+        { key: 'region', label: '区域' },
+        { key: 'customerShortName', label: '简写名称' },
+        { key: 'enterpriseType', label: '企业类型' },
+        { key: 'registerDate', label: '登记日期' },
+        { key: 'companyId', label: '单位名称' },
+        { key: 'creditLimit', label: '授信额度' },
+        { key: 'settlementPeriod', label: '结算期限' }
       ]
       ]
       for (const it of checks) {
       for (const it of checks) {
         const val = this.form[it.key]
         const val = this.form[it.key]
         if (val === undefined || val === null || String(val).trim() === '') {
         if (val === undefined || val === null || String(val).trim() === '') {
-          uni.showToast({ title: `请先选择${it.label}`, icon: 'none' })
+          const isInput = ['customerShortName', 'settlementPeriod', 'creditLimit'].includes(it.key);
+          const verb = isInput ? '输入' : '选择';
+          uni.showToast({ title: `请先${verb}${it.label}`, icon: 'none' })
           return false
           return false
         }
         }
       }
       }
@@ -759,4 +785,13 @@ export default {
     }
     }
   }
   }
 }
 }
+/* 只读文本样式 */
+.readonly-text {
+  color: rgba(0, 0, 0, 0.9);
+  font-size: 32rpx;
+  line-height: 48rpx;
+  text-align: right;
+  white-space: pre-wrap;
+  word-break: break-all;
+}
 </style>
 </style>

@@ -3,8 +3,9 @@
         <view class="section">
         <view class="section">
             <text class="row company">{{ form.companyName }}</text>
             <text class="row company">{{ form.companyName }}</text>
             <view class="row"><text class="label">编号</text><text class="value">{{ form.serialNumber }}</text></view>
             <view class="row"><text class="label">编号</text><text class="value">{{ form.serialNumber }}</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.regionName }}</text></view>
             <view class="row"><text class="label">区域</text><text class="value">{{ form.regionName }}</text></view>
-            <view class="row"><text class="label">客户简称</text><text class="value">{{ form.customerShortName }}</text>
+            <view class="row"><text class="label">简写名称</text><text class="value">{{ form.customerShortName }}</text>
             </view>
             </view>
             <view class="row"><text class="label">企业类型</text><text class="value">{{ getDicName('ENTERPRISE_TYPE',
             <view class="row"><text class="label">企业类型</text><text class="value">{{ getDicName('ENTERPRISE_TYPE',
                 form.enterpriseType, enterpriseTypeOptions) }}</text></view>
                 form.enterpriseType, enterpriseTypeOptions) }}</text></view>

+<template>
+  <view class="page">
+    <scroll-view class="scroll" scroll-y>
+      <uni-list>
+        <uni-list-item class="select-item" :class="form.code ? 'is-filled' : 'is-empty'">
+          <template v-slot:body>
+            <view class="item-title"><text class="required">*</text><text>编号</text></view>
+          </template>
+          <template v-slot:footer>
+            <view class="serial-number-row">
+              <uni-easyinput v-model="form.code" placeholder="自动生成编号" :inputBorder="false" disabled />
+              <button class="generate-btn" @click="loadCode">点此生成</button>
+            </view>
+          </template>
+        </uni-list-item>
+
+        <uni-list-item title="名称">
+          <template v-slot:body>
+            <view class="item-title"><text class="required">*</text><text>名称</text></view>
+          </template>
+          <template v-slot:footer>
+            <uni-easyinput v-model="form.name" placeholder="请输入名称" :inputBorder="false" />
+          </template>
+        </uni-list-item>
+
+        <uni-list-item title="联系人">
+          <template v-slot:footer>
+            <uni-easyinput v-model="form.contact" placeholder="请输入联系人" :inputBorder="false" />
+          </template>
+        </uni-list-item>
+
+        <uni-list-item title="联系电话">
+          <template v-slot:footer>
+            <uni-easyinput v-model="form.telephone" placeholder="请输入联系电话" :inputBorder="false" />
+          </template>
+        </uni-list-item>
+
+        <uni-list-item title="电子邮箱">
+          <template v-slot:footer>
+            <uni-easyinput v-model="form.email" placeholder="请输入电子邮箱" :inputBorder="false" />
+          </template>
+        </uni-list-item>
+
+        <uni-list-item title="邮编">
+          <template v-slot:footer>
+            <uni-easyinput v-model="form.zipCode" placeholder="请输入邮编" :inputBorder="false" />
+          </template>
+        </uni-list-item>
+
+        <uni-list-item title="传真">
+          <template v-slot:footer>
+            <uni-easyinput v-model="form.fax" placeholder="请输入传真" :inputBorder="false" />
+          </template>
+        </uni-list-item>
+
+        <uni-list-item class="select-item"
+          :class="(Array.isArray(form.cityIds) && form.cityIds.length) ? 'is-filled' : 'is-empty'" clickable
+          @click="openCitySelector" :rightText="form.cityLabel || '请选择'" showArrow>
+          <template v-slot:body>
+            <view class="item-title"><text>地区</text></view>
+            <CitySelector ref="citySelectorRef" v-model="form.cityIds" @change="onCityChange" />
+          </template>
+        </uni-list-item>
+
+        <uni-list-item title="地址">
+          <template v-slot:footer>
+            <uni-easyinput v-model="form.address" placeholder="请输入地址" :inputBorder="false" />
+          </template>
+        </uni-list-item>
+
+        <uni-list-item title="统一社会信用代码">
+          <template v-slot:footer>
+            <uni-easyinput v-model="form.creditCode" placeholder="请输入统一社会信用代码" :inputBorder="false" />
+          </template>
+        </uni-list-item>
+
+        <uni-list-item title="纳税人识别号">
+          <template v-slot:footer>
+            <uni-easyinput v-model="form.taxIdentifyNo" placeholder="请输入纳税人识别号" :inputBorder="false" />
+          </template>
+        </uni-list-item>
+
+        <uni-list-item title="开户银行">
+          <template v-slot:footer>
+            <uni-easyinput v-model="form.bankName" placeholder="请输入开户银行" :inputBorder="false" />
+          </template>
+        </uni-list-item>
+
+        <uni-list-item title="户名">
+          <template v-slot:footer>
+            <uni-easyinput v-model="form.accountName" placeholder="请输入户名" :inputBorder="false" />
+          </template>
+        </uni-list-item>
+
+        <uni-list-item title="银行账号">
+          <template v-slot:footer>
+            <uni-easyinput v-model="form.accountNo" placeholder="请输入银行账号" :inputBorder="false" />
+          </template>
+        </uni-list-item>
+
+        <uni-list-item title="备注">
+          <template v-slot:footer>
+            <uni-easyinput type="textarea" v-model="form.description" placeholder="请输入备注" :inputBorder="false" />
+          </template>
+        </uni-list-item>
+
+      </uni-list>
+    </scroll-view>
+
+    <view class="footer">
+      <button class="btn submit" type="primary" @click="onSubmit">提交</button>
+    </view>
+  </view>
+</template>
+
+<script>
+import { createApi } from '@/api/customer.js'
+import { generateCodeApi } from '@/api/base.js'
+import CitySelector from '@/components/city-selector/index.vue'
+import { isEmail } from '@/utils/common.js'
+
+export default {
+  name: 'CustomerAdd',
+  components: { CitySelector },
+  data() {
+    return {
+      form: {
+        code: '',
+        name: '',
+        contact: '',
+        telephone: '',
+        email: '',
+        zipCode: '',
+        fax: '',
+        cityIds: [],
+        cityLabel: '',
+        address: '',
+        creditCode: '',
+        taxIdentifyNo: '',
+        bankName: '',
+        accountName: '',
+        accountNo: '',
+        description: ''
+      }
+    }
+  },
+  created() {
+    this.loadCode()
+  },
+  methods: {
+    async loadCode() {
+      try {
+        const res = await generateCodeApi(5)
+        this.form.code = (res && res.data) || ''
+      } catch (e) {
+        this.form.code = ''
+      }
+    },
+    openCitySelector() {
+      this.$refs.citySelectorRef && this.$refs.citySelectorRef.open()
+    },
+    onCityChange(payload) {
+      const label = payload && payload.label != null ? payload.label : ''
+      this.form.cityLabel = label
+    },
+    validateRequired() {
+      if (!this.form.code) {
+        uni.showToast({ title: '请先生成编号', icon: 'none' })
+        return false
+      }
+      if (!this.form.name || !this.form.name.trim()) {
+        uni.showToast({ title: '请输入名称', icon: 'none' })
+        return false
+      }
+      if (this.form.email && !isEmail(this.form.email)) {
+        uni.showToast({ title: '邮箱地址格式不正确', icon: 'none' })
+        return false
+      }
+      return true
+    },
+    async onSubmit() {
+      if (!this.validateRequired()) return
+
+      const { cityIds, cityLabel, ...other } = this.form
+      // 取最后一个 ID 作为 city
+      const cityId = cityIds && cityIds.length > 0 ? cityIds[cityIds.length - 1] : ''
+
+      const payload = {
+        ...other,
+        cityId
+      }
+
+      console.log('onSubmit payload', payload)
+      try {
+        await createApi(payload)
+        uni.showToast({ title: '提交成功', icon: 'success' })
+        setTimeout(() => { uni.redirectTo({ url: '/pages/customer/index' }) }, 300)
+      } catch (e) {
+        uni.showToast({ title: (e && e.msg) || '提交失败', icon: 'none' })
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.page {
+  display: flex;
+  flex-direction: column;
+  height: 100vh;
+}
+
+.scroll {
+  flex: 1;
+  padding: 12rpx 0 160rpx;
+}
+
+.footer {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  padding: 32rpx;
+  padding-bottom: calc(32rpx + env(safe-area-inset-bottom));
+  background: #fff;
+  box-shadow: 0 -8rpx 24rpx rgba(0, 0, 0, 0.06);
+  z-index: 10;
+
+  .btn {
+    height: 80rpx;
+    line-height: 80rpx;
+    border-radius: 12rpx;
+    font-size: 32rpx;
+  }
+
+  .submit {
+    background: $theme-primary;
+    color: #fff;
+  }
+}
+
+::v-deep .uni-list {
+  background: transparent;
+
+  &-item {
+    &__extra-text {
+      font-size: 32rpx;
+    }
+
+    &__content-title {
+      font-size: 32rpx;
+      color: rgba(0, 0, 0, 0.9);
+    }
+
+    &__container {
+      padding: 32rpx;
+
+      .uni-easyinput {
+        .is-disabled {
+          background-color: transparent !important;
+        }
+
+        &__placeholder-class {
+          font-size: 32rpx;
+          color: rgba(0, 0, 0, 0.4);
+        }
+
+        &__content {
+          border: none;
+
+          &-input {
+            padding-left: 0 !important;
+            height: 48rpx;
+            line-height: 48rpx;
+            font-size: 32rpx;
+          }
+        }
+      }
+
+      .item-title,
+      .uni-list-item__content {
+        flex: none;
+        min-height: 48rpx;
+        line-height: 48rpx;
+        font-size: 32rpx;
+        position: relative;
+        width: 210rpx;
+        margin-right: 32rpx;
+        color: rgba(0, 0, 0, 0.9);
+        padding-right: 0;
+
+        .required {
+          color: red;
+          position: absolute;
+          top: 50%;
+          transform: translateY(-50%);
+          left: -16rpx;
+        }
+      }
+    }
+
+    &.select-item {
+      &.is-empty {
+        .uni-list-item__extra-text {
+          color: rgba(0, 0, 0, 0.4) !important;
+        }
+      }
+
+      &.is-filled {
+        .uni-list-item__extra-text {
+          color: rgba(0, 0, 0, 0.9) !important;
+        }
+      }
+
+      .serial-number-row {
+        display: flex;
+        align-items: center;
+
+        .generate-btn {
+          margin-left: 24rpx;
+          height: 64rpx;
+          line-height: 64rpx;
+          padding: 0 24rpx;
+          font-size: 28rpx;
+          border-radius: 8rpx;
+          background: $theme-primary;
+          color: #fff;
+        }
+      }
+    }
+  }
+}
+</style>