Merge branch 'cjerp-1.0_20251220' into cjerp-1.0_shipping

# Conflicts:
#	.idea/workspace.xml
#	pages.json
#	pages/customer/index.vue
#	pages/index.vue

@@ -12,6 +12,7 @@ export const statusMap = {
   '生产中': '#2BA471',
   '生产中': '#2BA471',
   '审核通过': '#2BA471',
   '审核通过': '#2BA471',
   '审核中': '#3D48A3',
   '审核中': '#3D48A3',
+  '审批中': '#3D48A3',
   '已签收': '#E7E7E7',
   '已签收': '#E7E7E7',
   '已取消': '#000',
   '已取消': '#000',
   '已发货': '#D54941',
   '已发货': '#D54941',
@@ -19,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({

@@ -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 || []

@@ -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>

@@ -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>

@@ -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 />
@@ -123,7 +144,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 type="textarea" v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" />
+                        <uni-easyinput type="textarea" v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" maxlength="2000"/>
                     </template>
                     </template>
                 </uni-list-item>
                 </uni-list-item>
                 <view class="quality">
                 <view class="quality">
@@ -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: '',
@@ -233,10 +260,10 @@ export default {
                 executionStandardName: '',
                 executionStandardName: '',
                 executionStandardRemarks: '',
                 executionStandardRemarks: '',
                 includesPackagingFee: false,
                 includesPackagingFee: false,
-                includesPackagingFeeName: '',
+                includesPackagingFeeName: '否',
                 includesTransportFee: false,
                 includesTransportFee: false,
-                includesTransportFeeName: '',
-                unit: '美元、公斤、元美/公斤',
+                includesTransportFeeName: '否',
+                unit: '美元、公斤、美元/公斤',
                 totalAmountCapital: '',
                 totalAmountCapital: '',
                 destinationId: [],
                 destinationId: [],
                 destinationLabel: '',
                 destinationLabel: '',
@@ -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
         }
         }
     }
     }

@@ -5,15 +5,22 @@
                 <view class="section">
                 <view class="section">
                     <text class="row customer">{{ detail.code }}</text>
                     <text class="row customer">{{ detail.code }}</text>
                     <view class="row" v-if="status === 'STANDARD'"><text class="label">正式合同规范性审核</text><text class="value"><span class="info-status" :style="detail.standardApprovedName ? getStatusCss(detail.standardApprovedName) : ''" >{{ detail.standardApprovedName || '-' }}</span></text></view>
                     <view class="row" v-if="status === 'STANDARD'"><text class="label">正式合同规范性审核</text><text class="value"><span class="info-status" :style="detail.standardApprovedName ? getStatusCss(detail.standardApprovedName) : ''" >{{ detail.standardApprovedName || '-' }}</span></text></view>
+                    <view v-if="detail.status === 'STANDARD'" :class="['status', `status_${detail.shippingStatusName}`]" />                    
                     <view class="row"><text class="label">供方</text><text class="value">{{ detail.supplierName || '-'
                     <view class="row"><text class="label">供方</text><text class="value">{{ detail.supplierName || '-'
                     }}</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">
@@ -106,11 +113,13 @@
 </template>
 </template>
 
 
 <script>
 <script>
-import { getContractApi, deleteContractApi, uploadStandardContract, uploadSignedContractFile, statusStyle} from '@/api/contract'
+import { getContractApi, deleteContractApi, uploadStandardContract, uploadSignedContractFile, statusStyle, statusMap } from '@/api/contract'
 import ProductRel from './productRel.vue'
 import ProductRel from './productRel.vue'
 import DetailButtons from '@/components/detail-buttons/index.vue'
 import DetailButtons from '@/components/detail-buttons/index.vue'
 import FileUpload from '@/components/file-upload/index.vue'
 import FileUpload from '@/components/file-upload/index.vue'
 import SingleSelectSheet from '@/components/single-select/index.vue'
 import SingleSelectSheet from '@/components/single-select/index.vue'
+import { fillStandardApprovedName } from '@/utils/dic.js'
+
 export default {
 export default {
     name: 'ContractForeignStdDetail',
     name: 'ContractForeignStdDetail',
     components: { ProductRel, DetailButtons, FileUpload, SingleSelectSheet },
     components: { ProductRel, DetailButtons, FileUpload, SingleSelectSheet },
@@ -130,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: '',
@@ -161,6 +175,7 @@ export default {
                 packaging: ''
                 packaging: ''
             },
             },
             statusStyle: statusStyle,
             statusStyle: statusStyle,
+            statusMap: statusMap,
             productList: [],
             productList: [],
             buttons: [{
             buttons: [{
                 text: '编辑',
                 text: '编辑',
@@ -199,7 +214,6 @@ export default {
             {
             {
                 text: '审核详情',
                 text: '审核详情',
                 visible: true,
                 visible: true,
-                variant: 'primary',
                 event: 'auditDetail'
                 event: 'auditDetail'
             },
             },
             ],
             ],
@@ -211,7 +225,7 @@ export default {
             const t = this.detail.standardApproved || false
             const t = this.detail.standardApproved || false
             const e = this.detail.standardShowExamine || false
             const e = this.detail.standardShowExamine || false
             return [
             return [
-                { ...this.buttons[0], visible: (s === 'DRAFT' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:modifyx')) },
+                { ...this.buttons[0], visible: (s === 'DRAFT' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:modify')) },
                 { ...this.buttons[1], visible: (s === 'DRAFT' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:delete')) },
                 { ...this.buttons[1], visible: (s === 'DRAFT' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:delete')) },
                 { ...this.buttons[2], visible: (s !== 'DELETED' && t !== 'AUDIT' && t !== 'PASS' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:upload')) },
                 { ...this.buttons[2], visible: (s !== 'DELETED' && t !== 'AUDIT' && t !== 'PASS' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:upload')) },
                 { ...this.buttons[3], visible: (s === 'STANDARD' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:upload-seal')) },
                 { ...this.buttons[3], visible: (s === 'STANDARD' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:upload-seal')) },
@@ -369,10 +383,14 @@ 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}` : '',
                 }
                 }
+                this.detail = await fillStandardApprovedName(this.detail)
                 const lines = Array.isArray(data.contractDistributorLineList) ? data.contractDistributorLineList : []
                 const lines = Array.isArray(data.contractDistributorLineList) ? data.contractDistributorLineList : []
                 this.productList = lines
                 this.productList = lines
             } catch (e) {
             } catch (e) {
@@ -410,6 +428,32 @@ export default {
     padding: 32rpx;
     padding: 32rpx;
     background: #fff;
     background: #fff;
     margin-bottom: 20rpx;
     margin-bottom: 20rpx;
+    .status {
+    position: absolute;
+    top: 16rpx;
+    right: 52rpx;
+    width: 180rpx;
+    height: 146rpx;
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    background-position: center;
+
+    &_审批中 {
+      background-image: url('~@/static/images/contract/status_1.png');
+    }
+
+    &_生产中 {
+      background-image: url('~@/static/images/contract/status_2.png');
+    }
+
+    &_已发货 {
+      background-image: url('~@/static/images/contract/status_3.png');
+    }
+
+    &_已签收 {
+      background-image: url('~@/static/images/contract/status_4.png');
+    }
+  }
 }
 }
 
 
 .section1 {
 .section1 {

@@ -61,7 +61,7 @@
               <text>订单总额</text><text class="amount" :style="{ color: '#b67a76' }">{{ item.totalAmountIncludingTax ? '¥' : '' }}{{ formatAmount(item.totalAmountIncludingTax) || '-' }}</text>
               <text>订单总额</text><text class="amount" :style="{ color: '#b67a76' }">{{ item.totalAmountIncludingTax ? '¥' : '' }}{{ formatAmount(item.totalAmountIncludingTax) || '-' }}</text>
             </view>
             </view>
             <view class="info-row" v-if="item.status === 'STANDARD'">
             <view class="info-row" v-if="item.status === 'STANDARD'">
-              <text>正式合同规范性审核状态</text><span class="info-status" :style="item.standardApprovedName ? getStatusCss(item.standardApprovedName) : ''">{{ item.standardApprovedName || '-' }}</span>
+              <text>标准合同规范性审核状态</text><span class="info-status" :style="item.standardApprovedName ? getStatusCss(item.standardApprovedName) : ''">{{ item.standardApprovedName || '-' }}</span>
             </view>
             </view>
             <view class="info-row">
             <view class="info-row">
               <text>订货日期</text><text>{{ item.orderDate }}</text>
               <text>订货日期</text><text>{{ item.orderDate }}</text>
@@ -104,11 +104,7 @@ export default {
       searchKeyword: '',
       searchKeyword: '',
       searchKeywordDebounced: '',
       searchKeywordDebounced: '',
 
 
-      tabs: [
-        { label: '草稿合同', value: 'DRAFT' },
-        { label: '标准合同', value: 'STANDARD' },
-        { label: '已删除合同', value: 'DELETED' }
-      ],
+
       status: 'DRAFT',
       status: 'DRAFT',
 
 
       query: { deptId: '', deptName: '', dateRange: [] },
       query: { deptId: '', deptName: '', dateRange: [] },
@@ -126,6 +122,23 @@ export default {
     }
     }
   },
   },
   computed: {
   computed: {
+    roleCodes() {
+      const g = this.$store && this.$store.getters
+      return (g && g.roleCodes) || []
+    },
+    tabs() {
+      if (this.roleCodes.includes('constract_admin')) {
+        return [
+          { label: '草稿合同', value: 'DRAFT' },
+          { label: '标准合同', value: 'STANDARD' },
+          { label: '已删除合同', value: 'DELETED' }
+        ]
+      }
+      return [
+        { label: '草稿合同', value: 'DRAFT' },
+        { label: '标准合同', value: 'STANDARD' }
+      ]
+    },
     extraCombined() {
     extraCombined() {
       return {
       return {
         keyword: this.searchKeywordDebounced || undefined,
         keyword: this.searchKeywordDebounced || undefined,
@@ -344,10 +357,10 @@ export default {
         margin-bottom: 0;
         margin-bottom: 0;
         }
         }
         text {
         text {
-            width: 60%;
+            width: 50%;
             &:last-child {
             &:last-child {
                 color: rgba(0,0,0,0.9);
                 color: rgba(0,0,0,0.9);
-                width: 40%;
+                width: 50%;
             }
             }
         }
         }
     }
     }

@@ -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"
@@ -121,7 +143,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.remarks" placeholder="请输入备注" :inputBorder="false" />
+                        <uni-easyinput v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" maxlength="2000" />
                     </template>
                     </template>
                 </uni-list-item>
                 </uni-list-item>
 
 
@@ -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: '',
@@ -220,9 +249,9 @@ export default {
                 executionStandardName: '',
                 executionStandardName: '',
                 executionStandardRemarks: '',
                 executionStandardRemarks: '',
                 includesPackagingFee: false,
                 includesPackagingFee: false,
-                includesPackagingFeeName: '',
+                includesPackagingFeeName: '否',
                 includesTransportFee: false,
                 includesTransportFee: false,
-                includesTransportFeeName: '',
+                includesTransportFeeName: '否',
                 unit: '美元、公斤、美元/公斤',
                 unit: '美元、公斤、美元/公斤',
                 totalAmountCapital: '',
                 totalAmountCapital: '',
                 depositInfo: '',
                 depositInfo: '',
@@ -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 />
@@ -123,7 +147,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 type="textarea" v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" />
+                        <uni-easyinput type="textarea" v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" maxlength="2000" />
                     </template>
                     </template>
                 </uni-list-item>
                 </uni-list-item>
                 <view class="quality">
                 <view class="quality">
@@ -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: '',
@@ -233,16 +260,20 @@ export default {
                 executionStandardName: '',
                 executionStandardName: '',
                 executionStandardRemarks: '',
                 executionStandardRemarks: '',
                 includesPackagingFee: false,
                 includesPackagingFee: false,
-                includesPackagingFeeName: '',
+                includesPackagingFeeName: '否',
                 includesTransportFee: false,
                 includesTransportFee: false,
-                includesTransportFeeName: '',
+                includesTransportFeeName: '否',
                 unit: '美元、公斤、美元/公斤',
                 unit: '美元、公斤、美元/公斤',
                 totalAmountCapital: '',
                 totalAmountCapital: '',
                 destinationId: [],
                 destinationId: [],
                 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

@@ -4,16 +4,29 @@
             <view class="detail-page">
             <view class="detail-page">
                 <view class="section">
                 <view class="section">
                     <text class="row customer">{{ detail.code }}</text>
                     <text class="row customer">{{ detail.code }}</text>
-                    <view class="row" v-if="detail.status === 'STANDARD' || detail.status === 'FORMAL'"><text class="label">{{ detail.status === 'STANDARD' ? '标准合同' : '正式合同' }}规范性审核状态</text><text class="value"><span class="info-status" :style="detail.standardApprovedName ? getStatusCss(detail.standardApprovedName) : ''" >{{ detail.standardApprovedName || '-' }}</span></text></view>
+                    <view class="row" v-if="detail.status === 'STANDARD' || detail.status === 'FORMAL'">
+                        <text class="label">{{ detail.status === 'STANDARD' ? '标准合同' : '正式合同' }}规范性审核状态</text>
+                        <text class="value">
+                            <span v-if="detail.status === 'STANDARD'" class="info-status" :style="detail.standardApprovedName ? getStatusCss(detail.standardApprovedName) : ''" >{{ detail.standardApprovedName || '-' }}</span>
+                            <span v-if="detail.status === 'FORMAL'" class="info-status" :style="detail.formalApprovedName ? getStatusCss(detail.formalApprovedName) : ''" >{{ detail.formalApprovedName || '-' }}</span>
+                        </text>
+                    </view>                    
+                    <view v-if="detail.status === 'STANDARD'" :class="['status', `status_${detail.shippingStatusName}`]" />                                        
                     <view class="row"><text class="label">供方</text><text class="value">{{ detail.supplierName || '-'
                     <view class="row"><text class="label">供方</text><text class="value">{{ detail.supplierName || '-'
                     }}</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">
@@ -113,11 +126,12 @@
 </template>
 </template>
 
 
 <script>
 <script>
-import { getContractApi, deleteContractApi, uploadFormalContract, uploadStandardContract, uploadSignedContractFile, statusStyle } from '@/api/contract'
+import { getContractApi, deleteContractApi, uploadFormalContract, uploadStandardContract, uploadSignedContractFile, statusStyle, statusMap } from '@/api/contract'
 import ProductRel from './productRel.vue'
 import ProductRel from './productRel.vue'
 import DetailButtons from '@/components/detail-buttons/index.vue'
 import DetailButtons from '@/components/detail-buttons/index.vue'
 import FileUpload from '@/components/file-upload/index.vue'
 import FileUpload from '@/components/file-upload/index.vue'
 import SingleSelectSheet from '@/components/single-select/index.vue'
 import SingleSelectSheet from '@/components/single-select/index.vue'
+import { fillStandardApprovedName, fillFormalApprovedName } from '@/utils/dic.js'
 
 
 export default {
 export default {
     name: 'ContractForeignStockDetail',
     name: 'ContractForeignStockDetail',
@@ -133,16 +147,22 @@ export default {
             standardStandardizedName: '',
             standardStandardizedName: '',
             sheet: { visible: false, title: '请选择', options: [], value: '' },
             sheet: { visible: false, title: '请选择', options: [], value: '' },
             statusStyle: statusStyle,
             statusStyle: statusStyle,
+            statusMap: statusMap,
             detail: {
             detail: {
                 code: '',
                 code: '',
                 supplier: '',
                 supplier: '',
                 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: '',
@@ -232,19 +252,16 @@ export default {
             {
             {
                 text: '正式合同审核详情',
                 text: '正式合同审核详情',
                 visible: true,
                 visible: true,
-                variant: 'primary',
                 event: 'auditDetail1'
                 event: 'auditDetail1'
             },
             },
             {
             {
                 text: '正式合同审核详情',
                 text: '正式合同审核详情',
                 visible: true,
                 visible: true,
-                variant: 'primary',
                 event: 'auditDetail2'
                 event: 'auditDetail2'
             },
             },
             {
             {
                 text: '标准合同审核详情',
                 text: '标准合同审核详情',
                 visible: true,
                 visible: true,
-                variant: 'primary',
                 event: 'auditDetail3'
                 event: 'auditDetail3'
             },
             },
             {
             {
@@ -451,10 +468,15 @@ 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}` : '',
                 }
                 }
+                this.detail = await fillStandardApprovedName(this.detail)
+                this.detail = await fillFormalApprovedName(this.detail)
                 const lines = Array.isArray(data.contractDistributorLineList) ? data.contractDistributorLineList : []
                 const lines = Array.isArray(data.contractDistributorLineList) ? data.contractDistributorLineList : []
                 this.productList = lines
                 this.productList = lines
             } catch (e) {
             } catch (e) {
@@ -492,6 +514,32 @@ export default {
     padding: 32rpx;
     padding: 32rpx;
     background: #fff;
     background: #fff;
     margin-bottom: 20rpx;
     margin-bottom: 20rpx;
+    .status {
+    position: absolute;
+    top: 16rpx;
+    right: 52rpx;
+    width: 180rpx;
+    height: 146rpx;
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    background-position: center;
+
+    &_审批中 {
+      background-image: url('~@/static/images/contract/status_1.png');
+    }
+
+    &_生产中 {
+      background-image: url('~@/static/images/contract/status_2.png');
+    }
+
+    &_已发货 {
+      background-image: url('~@/static/images/contract/status_3.png');
+    }
+
+    &_已签收 {
+      background-image: url('~@/static/images/contract/status_4.png');
+    }
+  }
 }
 }
 
 
 .section1 {
 .section1 {

@@ -105,13 +105,6 @@ export default {
     return {
     return {
       searchKeyword: '',
       searchKeyword: '',
       searchKeywordDebounced: '',
       searchKeywordDebounced: '',
-
-      tabs: [
-        { label: '草稿合同', value: 'DRAFT' },
-        { label: '正式合同', value: 'FORMAL' },
-        { label: '标准合同', value: 'STANDARD' },
-        { label: '已删除合同', value: 'DELETED' }
-      ],
       status: 'DRAFT',
       status: 'DRAFT',
 
 
       query: { deptId: '', deptName: '', dateRange: [] },
       query: { deptId: '', deptName: '', dateRange: [] },
@@ -129,6 +122,25 @@ export default {
     }
     }
   },
   },
   computed: {
   computed: {
+    roleCodes() {
+      const g = this.$store && this.$store.getters
+      return (g && g.roleCodes) || []
+    },
+    tabs() {
+      if (this.roleCodes.includes('constract_admin')) {
+        return [
+          { label: '草稿合同', value: 'DRAFT' },
+          { label: '正式合同', value: 'FORMAL' },
+          { label: '标准合同', value: 'STANDARD' },
+          { label: '已删除合同', value: 'DELETED' }
+        ]
+      }
+      return [
+        { label: '草稿合同', value: 'DRAFT' },
+        { label: '正式合同', value: 'FORMAL' },
+        { label: '标准合同', value: 'STANDARD' }
+      ]
+    },
     extraCombined() {
     extraCombined() {
       return {
       return {
         keyword: this.searchKeywordDebounced || undefined,
         keyword: this.searchKeywordDebounced || undefined,
@@ -359,10 +371,10 @@ export default {
         margin-bottom: 0;
         margin-bottom: 0;
         }
         }
         text {
         text {
-            width: 60%;
+            width: 50%;
             &:last-child {
             &:last-child {
                 color: rgba(0,0,0,0.9);
                 color: rgba(0,0,0,0.9);
-                width: 40%;
+                width: 50%;
             }
             }
         }
         }
     }
     }

@@ -40,9 +40,30 @@
                                 <uni-easyinput v-model="item.quality" placeholder="请输入品质" :clearable="false" disabled />
                                 <uni-easyinput v-model="item.quality" placeholder="请输入品质" :clearable="false" disabled />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
-                        <uni-list-item title="规格">
+                        <uni-list-item title="规格(mm)">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput v-model="item.specDisplay" placeholder="自动拼接规格" :clearable="false" disabled />
+                                <!-- <uni-easyinput v-model="item.specDisplay" placeholder="自动拼接规格" :clearable="false" disabled /> -->
+                            <view class="value value-spec">
+                            <view v-if="item.thickness" class="value-spec_val">{{ item.thickness }}</view>
+                            <view v-if="item.thickness" class="value-spec_box">
+                                <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }}
+                                </view>
+                                <view v-if="item.thicknessTolNeg" class="value-spec_box_2">-{{ item.thicknessTolNeg }}
+                                </view>
+                            </view>
+                            <view v-if="item.width" class="value-spec_val p12">*</view>
+                            <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
+                            <view v-if="item.width" class="value-spec_box">
+                                <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view>
+                                <view v-if="item.widthTolNeg" class="value-spec_box_2">-{{ item.widthTolNeg }}</view>
+                            </view>
+                            <view v-if="item.length" class="value-spec_val p12">*</view>
+                            <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
+                            <view v-if="item.length" class="value-spec_box">
+                                <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view>
+                                <view v-if="item.lengthTolNeg" class="value-spec_box_2">-{{ item.lengthTolNeg }}</view>
+                            </view>
+                        </view>
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="状态">
                         <uni-list-item title="状态">
@@ -699,4 +720,42 @@ export default {
     background: $theme-primary;
     background: $theme-primary;
     color: #fff;
     color: #fff;
 }
 }
+   .value-spec {
+        height: 48rpx;
+        display: flex;
+        align-items: center;
+        color: #000000;
+        // justify-content: end;
+        &_box {
+            position: relative;
+            width: 60rpx;
+            height: 48rpx;
+
+            &_1 {
+                font-size: 16rpx;
+                position: absolute;
+                top: -10rpx;
+                left: 0;
+            }
+
+            &_2 {
+                font-size: 16rpx;
+                position: absolute;
+                bottom: -10rpx;
+                left: 0;
+            }
+        }
+
+        &_val {
+            font-size: 28rpx;
+
+            &.p12 {
+                padding-right: 12rpx;
+            }
+        }
+    }
+        .row-spec {
+            height: 60rpx;
+            align-items: center;
+        }
 </style>
 </style>

@@ -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>
@@ -123,7 +147,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.remarks" placeholder="请输入备注" :inputBorder="false" />
+                        <uni-easyinput v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" maxlength="2000" />
                     </template>
                     </template>
                 </uni-list-item>
                 </uni-list-item>
 
 
@@ -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: '',
@@ -222,9 +254,9 @@ export default {
                 executionStandardName: '',
                 executionStandardName: '',
                 executionStandardRemarks: '',
                 executionStandardRemarks: '',
                 includesPackagingFee: false,
                 includesPackagingFee: false,
-                includesPackagingFeeName: '',
+                includesPackagingFeeName: '否',
                 includesTransportFee: false,
                 includesTransportFee: false,
-                includesTransportFeeName: '',
+                includesTransportFeeName: '否',
                 unit: '美元、公斤、美元/公斤',
                 unit: '美元、公斤、美元/公斤',
                 totalAmountCapital: '',
                 totalAmountCapital: '',
                 depositInfo: '',
                 depositInfo: '',
@@ -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 />
@@ -123,7 +145,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 type="textarea" v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" />
+                        <uni-easyinput type="textarea" v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" maxlength="2000" />
                     </template>
                     </template>
                 </uni-list-item>
                 </uni-list-item>
                 <view class="quality">
                 <view class="quality">
@@ -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: '',
@@ -233,15 +258,19 @@ export default {
                 executionStandardName: '',
                 executionStandardName: '',
                 executionStandardRemarks: '',
                 executionStandardRemarks: '',
                 includesPackagingFee: false,
                 includesPackagingFee: false,
-                includesPackagingFeeName: '',
+                includesPackagingFeeName: '否',
                 includesTransportFee: false,
                 includesTransportFee: false,
-                includesTransportFeeName: '',
+                includesTransportFeeName: '否',
                 unit: '美元、公斤、美元/公斤',
                 unit: '美元、公斤、美元/公斤',
                 totalAmountCapital: '',
                 totalAmountCapital: '',
                 destinationId: [],
                 destinationId: [],
                 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) {

@@ -4,16 +4,31 @@
             <view class="detail-page">
             <view class="detail-page">
                 <view class="section">
                 <view class="section">
                     <text class="row customer">{{ detail.code }}</text>
                     <text class="row customer">{{ detail.code }}</text>
-                    <view class="row" v-if="detail.status === 'STANDARD' || detail.status === 'FORMAL'"><text class="label">{{ detail.status === 'STANDARD' ? '标准合同' : '正式合同' }}规范性审核状态</text><text class="value"><span class="info-status" :style="detail.standardApprovedName ? getStatusCss(detail.standardApprovedName) : ''" >{{ detail.standardApprovedName || '-' }}</span></text></view>
+                    <view class="row" v-if="detail.status === 'STANDARD' || detail.status === 'FORMAL'">
+                        <text class="label">{{ detail.status === 'STANDARD' ? '标准合同' : '正式合同' }}规范性审核状态</text>
+                        <text class="value">
+
+                            <span v-if="detail.status === 'STANDARD'" class="info-status" :style="detail.standardApprovedName ? getStatusCss(detail.standardApprovedName) : ''" >{{ detail.standardApprovedName || '-' }}</span>
+                            <span v-if="detail.status === 'FORMAL'" class="info-status" :style="detail.formalApprovedName ? getStatusCss(detail.formalApprovedName) : ''" >{{ detail.formalApprovedName || '-' }}</span>
+                            
+                        </text>
+                    </view>                    
+                    <view v-if="detail.status === 'STANDARD'" :class="['status', `status_${detail.shippingStatusName}`]" />                    
                     <view class="row"><text class="label">供方</text><text class="value">{{ detail.supplierName || '-'
                     <view class="row"><text class="label">供方</text><text class="value">{{ detail.supplierName || '-'
                     }}</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">
@@ -114,11 +129,12 @@
 </template>
 </template>
 
 
 <script>
 <script>
-import { getContractApi, deleteContractApi, uploadFormalContract, uploadStandardContract, uploadSignedContractFile, statusStyle } from '@/api/contract'
+import { getContractApi, deleteContractApi, uploadFormalContract, uploadStandardContract, uploadSignedContractFile, statusStyle, statusMap,showContract } from '@/api/contract'
 import ProductRel from './productRel.vue'
 import ProductRel from './productRel.vue'
 import DetailButtons from '@/components/detail-buttons/index.vue'
 import DetailButtons from '@/components/detail-buttons/index.vue'
 import FileUpload from '@/components/file-upload/index.vue'
 import FileUpload from '@/components/file-upload/index.vue'
 import SingleSelectSheet from '@/components/single-select/index.vue'
 import SingleSelectSheet from '@/components/single-select/index.vue'
+import { fillStandardApprovedName, fillFormalApprovedName } from '@/utils/dic.js'
 
 
 export default {
 export default {
     name: 'ContractForeignUnplanDetail',
     name: 'ContractForeignUnplanDetail',
@@ -139,10 +155,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: '',
@@ -171,6 +192,7 @@ export default {
             },
             },
             productList: [],
             productList: [],
             statusStyle: statusStyle,
             statusStyle: statusStyle,
+            statusMap: statusMap,
             buttons: [{
             buttons: [{
                 text: '编辑',
                 text: '编辑',
                 visible: true,
                 visible: true,
@@ -238,19 +260,16 @@ export default {
             {
             {
                 text: '正式合同审核详情',
                 text: '正式合同审核详情',
                 visible: true,
                 visible: true,
-                variant: 'primary',
                 event: 'auditDetail1'
                 event: 'auditDetail1'
             },
             },
             {
             {
                 text: '正式合同审核详情',
                 text: '正式合同审核详情',
                 visible: true,
                 visible: true,
-                variant: 'primary',
                 event: 'auditDetail2'
                 event: 'auditDetail2'
             },
             },
             {
             {
                 text: '标准合同审核详情',
                 text: '标准合同审核详情',
                 visible: true,
                 visible: true,
-                variant: 'primary',
                 event: 'auditDetail3'
                 event: 'auditDetail3'
             },
             },
             {
             {
@@ -334,8 +353,10 @@ export default {
             })
             })
         },
         },
         onLockApply() {
         onLockApply() {
-            uni.navigateTo({
-                url: '/pages/contract_foreign_unplan/lock_apply?id=' + this.detail.id || ''
+            showContract(this.detail.id).then(res => {
+                uni.navigateTo({
+                    url: '/pages/contract_foreign_unplan/lock_apply?id=' + this.detail.id || ''
+                })
             })
             })
         },
         },
         onEdit() {
         onEdit() {
@@ -461,10 +482,15 @@ 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}` : '',
                 }
                 }
+                this.detail = await fillStandardApprovedName(this.detail)
+                this.detail = await fillFormalApprovedName(this.detail)
                 const lines = Array.isArray(data.contractDistributorLineList) ? data.contractDistributorLineList : []
                 const lines = Array.isArray(data.contractDistributorLineList) ? data.contractDistributorLineList : []
                 this.productList = lines
                 this.productList = lines
             } catch (e) {
             } catch (e) {
@@ -502,6 +528,32 @@ export default {
     padding: 32rpx;
     padding: 32rpx;
     background: #fff;
     background: #fff;
     margin-bottom: 20rpx;
     margin-bottom: 20rpx;
+    .status {
+    position: absolute;
+    top: 16rpx;
+    right: 52rpx;
+    width: 180rpx;
+    height: 146rpx;
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    background-position: center;
+
+    &_审批中 {
+      background-image: url('~@/static/images/contract/status_1.png');
+    }
+
+    &_生产中 {
+      background-image: url('~@/static/images/contract/status_2.png');
+    }
+
+    &_已发货 {
+      background-image: url('~@/static/images/contract/status_3.png');
+    }
+
+    &_已签收 {
+      background-image: url('~@/static/images/contract/status_4.png');
+    }
+  }
 }
 }
 
 
 .section1 {
 .section1 {

@@ -105,13 +105,6 @@ export default {
     return {
     return {
       searchKeyword: '',
       searchKeyword: '',
       searchKeywordDebounced: '',
       searchKeywordDebounced: '',
-
-      tabs: [
-        { label: '草稿合同', value: 'DRAFT' },
-        { label: '正式合同', value: 'FORMAL' },
-        { label: '标准合同', value: 'STANDARD' },
-        { label: '已删除合同', value: 'DELETED' }
-      ],
       status: 'DRAFT',
       status: 'DRAFT',
 
 
       query: { deptId: '', deptName: '', dateRange: [] },
       query: { deptId: '', deptName: '', dateRange: [] },
@@ -129,6 +122,25 @@ export default {
     }
     }
   },
   },
   computed: {
   computed: {
+    roleCodes() {
+      const g = this.$store && this.$store.getters
+      return (g && g.roleCodes) || []
+    },
+    tabs() {
+      if (this.roleCodes.includes('constract_admin')) {
+        return [
+          { label: '草稿合同', value: 'DRAFT' },
+          { label: '正式合同', value: 'FORMAL' },
+          { label: '标准合同', value: 'STANDARD' },
+          { label: '已删除合同', value: 'DELETED' }
+        ]
+      }
+      return [
+        { label: '草稿合同', value: 'DRAFT' },
+        { label: '正式合同', value: 'FORMAL' },
+        { label: '标准合同', value: 'STANDARD' }
+      ]
+    },
     extraCombined() {
     extraCombined() {
       return {
       return {
         keyword: this.searchKeywordDebounced || undefined,
         keyword: this.searchKeywordDebounced || undefined,
@@ -361,10 +373,10 @@ export default {
         margin-bottom: 0;
         margin-bottom: 0;
         }
         }
         text {
         text {
-            width: 60%;
+            width: 50%;
             &:last-child {
             &:last-child {
                 color: rgba(0,0,0,0.9);
                 color: rgba(0,0,0,0.9);
-                width: 40%;
+                width: 50%;
             }
             }
         }
         }
     }
     }

@@ -39,9 +39,30 @@
                                 <uni-easyinput v-model="item.quality" placeholder="请输入品质" :clearable="false" disabled />
                                 <uni-easyinput v-model="item.quality" placeholder="请输入品质" :clearable="false" disabled />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
-                        <uni-list-item title="规格">
+                        <uni-list-item title="规格(mm)">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput v-model="item.specDisplay" placeholder="自动拼接规格" :clearable="false" disabled />
+                                <!-- <uni-easyinput v-model="item.specDisplay" placeholder="自动拼接规格" :clearable="false" disabled /> -->
+                            <view class="value value-spec">
+                            <view v-if="item.thickness" class="value-spec_val">{{ item.thickness }}</view>
+                            <view v-if="item.thickness" class="value-spec_box">
+                                <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }}
+                                </view>
+                                <view v-if="item.thicknessTolNeg" class="value-spec_box_2">-{{ item.thicknessTolNeg }}
+                                </view>
+                            </view>
+                            <view v-if="item.width" class="value-spec_val p12">*</view>
+                            <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
+                            <view v-if="item.width" class="value-spec_box">
+                                <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view>
+                                <view v-if="item.widthTolNeg" class="value-spec_box_2">-{{ item.widthTolNeg }}</view>
+                            </view>
+                            <view v-if="item.length" class="value-spec_val p12">*</view>
+                            <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
+                            <view v-if="item.length" class="value-spec_box">
+                                <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view>
+                                <view v-if="item.lengthTolNeg" class="value-spec_box_2">-{{ item.lengthTolNeg }}</view>
+                            </view>
+                        </view>
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="状态">
                         <uni-list-item title="状态">
@@ -699,4 +720,42 @@ export default {
     background: $theme-primary;
     background: $theme-primary;
     color: #fff;
     color: #fff;
 }
 }
+.value-spec {
+        height: 48rpx;
+        display: flex;
+        align-items: center;
+        color: #000000;
+        // justify-content: end;
+        &_box {
+            position: relative;
+            width: 60rpx;
+            height: 48rpx;
+
+            &_1 {
+                font-size: 16rpx;
+                position: absolute;
+                top: -10rpx;
+                left: 0;
+            }
+
+            &_2 {
+                font-size: 16rpx;
+                position: absolute;
+                bottom: -10rpx;
+                left: 0;
+            }
+        }
+
+        &_val {
+            font-size: 28rpx;
+
+            &.p12 {
+                padding-right: 12rpx;
+            }
+        }
+    }
+        .row-spec {
+            height: 60rpx;
+            align-items: center;
+        }
 </style>
 </style>

@@ -108,11 +108,13 @@ export default {
                 const res = await showContract(this.id)
                 const res = await showContract(this.id)
                 const data = res && res.data ? res.data : {}
                 const data = res && res.data ? res.data : {}
                 this.detail = {
                 this.detail = {
+                    contractId: data.contractId || '',
                     contractCode: data.contractCode || '',
                     contractCode: data.contractCode || '',
                     customerName: data.customerName || '',
                     customerName: data.customerName || '',
                     deptName: data.deptName || '',
                     deptName: data.deptName || '',
                     workshopName: data.workshopName || '',
                     workshopName: data.workshopName || '',
                     orderType: data.orderType || '',
                     orderType: data.orderType || '',
+                    contractTypeCode: data.contractType || '',
                     contractType: data.contractType === 'DRAFT_DIST_AGMT' ? '经销订单' : '外贸订单',
                     contractType: data.contractType === 'DRAFT_DIST_AGMT' ? '经销订单' : '外贸订单',
                     orderDate: (data.orderDate || '').slice(0, 10),
                     orderDate: (data.orderDate || '').slice(0, 10),
                     applicationCount: data.applicationCount || '',
                     applicationCount: data.applicationCount || '',
@@ -139,6 +141,7 @@ export default {
                     if (res.confirm) {
                     if (res.confirm) {
                         specLockDelayApplication({
                         specLockDelayApplication({
                             ...this.detail,
                             ...this.detail,
+                            contractType: this.detail.contractTypeCode || '',
                             specLockDate: date,
                             specLockDate: date,
                             delayReason: reason
                             delayReason: reason
                         }).then(res => {
                         }).then(res => {

@@ -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>
@@ -123,7 +146,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.remarks" placeholder="请输入备注" :inputBorder="false" />
+                        <uni-easyinput v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" maxlength="2000" />
                     </template>
                     </template>
                 </uni-list-item>
                 </uni-list-item>
 
 
@@ -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: '',
@@ -222,9 +253,9 @@ export default {
                 executionStandardName: '',
                 executionStandardName: '',
                 executionStandardRemarks: '',
                 executionStandardRemarks: '',
                 includesPackagingFee: false,
                 includesPackagingFee: false,
-                includesPackagingFeeName: '',
+                includesPackagingFeeName: '否',
                 includesTransportFee: false,
                 includesTransportFee: false,
-                includesTransportFeeName: '',
+                includesTransportFeeName: '否',
                 unit: '美元、公斤、美元/公斤',
                 unit: '美元、公斤、美元/公斤',
                 totalAmountCapital: '',
                 totalAmountCapital: '',
                 depositInfo: '',
                 depositInfo: '',
@@ -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

@@ -36,7 +36,7 @@
           </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-datetime-picker type="date" v-model="form.validityTime" />
             <uni-datetime-picker type="date" v-model="form.validityTime" />
           </template>
           </template>
@@ -211,7 +211,7 @@ export default {
         { key: 'company', label: '所属单位' },
         { key: 'company', label: '所属单位' },
         { key: 'materialTypeId', label: '品种' },
         { key: 'materialTypeId', label: '品种' },
         { key: 'hasFrameworkAgreement', label: '是否签订框架合同' },
         { key: 'hasFrameworkAgreement', label: '是否签订框架合同' },
-        { key: 'validityTime', label: '授信截止日期' }
+        { key: 'validityTime', label: '授时截止日期' }
       ]
       ]
       for (const it of checks) {
       for (const it of checks) {
         const val = this.form[it.key]
         const val = this.form[it.key]

@@ -9,7 +9,7 @@
           <view class="row"><text class="label">品种</text><text class="value">{{ form.materialTypeName }}</text></view>
           <view class="row"><text class="label">品种</text><text class="value">{{ form.materialTypeName }}</text></view>
           <view class="row"><text class="label">是否签订</text><text class="value">{{ form.hasFrameworkAgreementName
           <view class="row"><text class="label">是否签订</text><text class="value">{{ form.hasFrameworkAgreementName
               }}</text></view>
               }}</text></view>
-          <view class="row"><text class="label">授信截止日期</text><text class="value">{{ form.validityTime }}</text></view>
+          <view class="row"><text class="label">授时截止日期</text><text class="value">{{ form.validityTime }}</text></view>
         </view>
         </view>
       </view>
       </view>
     </scroll-view>
     </scroll-view>

@@ -317,11 +317,11 @@ export default {
     }
     }
 
 
     text {
     text {
-      width: 60%;
+      width: 50%;
 
 
       &:last-child {
       &:last-child {
         color: rgba(0, 0, 0, 0.9);
         color: rgba(0, 0, 0, 0.9);
-        width: 40%;
+        width: 50%;
       }
       }
     }
     }
   }
   }

@@ -36,7 +36,7 @@
           </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-datetime-picker type="date" v-model="form.validityTime" />
             <uni-datetime-picker type="date" v-model="form.validityTime" />
           </template>
           </template>
@@ -160,7 +160,7 @@ export default {
         { key: 'company', label: '所属单位' },
         { key: 'company', label: '所属单位' },
         { key: 'materialTypeId', label: '品种' },
         { key: 'materialTypeId', label: '品种' },
         { key: 'hasFrameworkAgreement', label: '是否签订框架合同' },
         { key: 'hasFrameworkAgreement', label: '是否签订框架合同' },
-        { key: 'validityTime', label: '授信截止日期' }
+        { key: 'validityTime', label: '授时截止日期' }
       ]
       ]
       for (const it of checks) {
       for (const it of checks) {
         const val = this.form[it.key]
         const val = this.form[it.key]

@@ -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 />
@@ -123,7 +145,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 type="textarea" v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" />
+                        <uni-easyinput type="textarea" v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" maxlength="2000" />
                     </template>
                     </template>
                 </uni-list-item>
                 </uni-list-item>
                 <view class="quality">
                 <view class="quality">
@@ -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: '',
@@ -233,15 +258,19 @@ export default {
                 executionStandardName: '',
                 executionStandardName: '',
                 executionStandardRemarks: '',
                 executionStandardRemarks: '',
                 includesPackagingFee: false,
                 includesPackagingFee: false,
-                includesPackagingFeeName: '',
+                includesPackagingFeeName: '否',
                 includesTransportFee: false,
                 includesTransportFee: false,
-                includesTransportFeeName: '',
+                includesTransportFeeName: '否',
                 unit: '元、公斤、元/公斤',
                 unit: '元、公斤、元/公斤',
                 totalAmountCapital: '',
                 totalAmountCapital: '',
                 destinationId: [],
                 destinationId: [],
                 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

@@ -5,15 +5,22 @@ statusStyl<template>
                 <view class="section">
                 <view class="section">
                     <text class="row customer">{{ detail.code }}</text>
                     <text class="row customer">{{ detail.code }}</text>
                     <view class="row" v-if="status === 'STANDARD'"><text class="label">正式合同规范性审核</text><text class="value"><span class="info-status" :style="detail.standardApprovedName ? getStatusCss(detail.standardApprovedName) : ''" >{{ detail.standardApprovedName || '-' }}</span></text></view>
                     <view class="row" v-if="status === 'STANDARD'"><text class="label">正式合同规范性审核</text><text class="value"><span class="info-status" :style="detail.standardApprovedName ? getStatusCss(detail.standardApprovedName) : ''" >{{ detail.standardApprovedName || '-' }}</span></text></view>
+                    <view v-if="detail.status === 'STANDARD'" :class="['status', `status_${detail.shippingStatusName}`]" />                    
                     <view class="row"><text class="label">承揽方</text><text class="value">{{ detail.supplierName || '-'
                     <view class="row"><text class="label">承揽方</text><text class="value">{{ detail.supplierName || '-'
                             }}</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">
@@ -104,12 +111,12 @@ statusStyl<template>
 </template>
 </template>
 
 
 <script>
 <script>
-import { getContractApi, deleteContractApi, uploadStandardContract, statusStyle } from '@/api/contract'
+import { getContractApi, deleteContractApi, uploadStandardContract, statusStyle, statusMap } from '@/api/contract'
 import ProductRel from './productRel.vue'
 import ProductRel from './productRel.vue'
 import DetailButtons from '@/components/detail-buttons/index.vue'
 import DetailButtons from '@/components/detail-buttons/index.vue'
 import FileUpload from '@/components/file-upload/index.vue'
 import FileUpload from '@/components/file-upload/index.vue'
 import SingleSelectSheet from '@/components/single-select/index.vue'
 import SingleSelectSheet from '@/components/single-select/index.vue'
-
+import { fillStandardApprovedName } from '@/utils/dic.js'
 
 
 export default {
 export default {
     name: 'ContractProcessDetail',
     name: 'ContractProcessDetail',
@@ -129,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: '',
@@ -161,6 +173,7 @@ export default {
             },
             },
             productList: [],
             productList: [],
             statusStyle: statusStyle,
             statusStyle: statusStyle,
+            statusMap: statusMap,
           buttons: [{
           buttons: [{
             text: '编辑',
             text: '编辑',
             visible: true,
             visible: true,
@@ -192,7 +205,6 @@ export default {
           {
           {
             text: '审核详情',
             text: '审核详情',
             visible: true,
             visible: true,
-            variant: 'primary',
             event: 'auditDetail'
             event: 'auditDetail'
           },
           },
         ],
         ],
@@ -352,13 +364,17 @@ 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}` : '',
                 }
                 }
+                this.detail = await fillStandardApprovedName(this.detail)
                 const lines = Array.isArray(data.contractStdProcessingLineList) ? data.contractStdProcessingLineList : []
                 const lines = Array.isArray(data.contractStdProcessingLineList) ? data.contractStdProcessingLineList : []
                 this.productList = lines
                 this.productList = lines
             } catch (e) {
             } catch (e) {
@@ -396,6 +412,32 @@ export default {
     padding: 32rpx;
     padding: 32rpx;
     background: #fff;
     background: #fff;
     margin-bottom: 20rpx;
     margin-bottom: 20rpx;
+    .status {
+    position: absolute;
+    top: 16rpx;
+    right: 52rpx;
+    width: 180rpx;
+    height: 146rpx;
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    background-position: center;
+
+    &_审批中 {
+      background-image: url('~@/static/images/contract/status_1.png');
+    }
+
+    &_生产中 {
+      background-image: url('~@/static/images/contract/status_2.png');
+    }
+
+    &_已发货 {
+      background-image: url('~@/static/images/contract/status_3.png');
+    }
+
+    &_已签收 {
+      background-image: url('~@/static/images/contract/status_4.png');
+    }
+  }
 }
 }
 .section1 {
 .section1 {
     background: #fff;
     background: #fff;

@@ -61,7 +61,7 @@
               <text>订单总额</text><text class="amount" :style="{ color: '#b67a76' }">{{ item.totalAmountIncludingTax ? '¥' : '' }}{{ formatAmount(item.totalAmountIncludingTax) || '-' }}</text>
               <text>订单总额</text><text class="amount" :style="{ color: '#b67a76' }">{{ item.totalAmountIncludingTax ? '¥' : '' }}{{ formatAmount(item.totalAmountIncludingTax) || '-' }}</text>
             </view>
             </view>
             <view class="info-row" v-if="item.status === 'STANDARD'">
             <view class="info-row" v-if="item.status === 'STANDARD'">
-              <text>正式合同规范性审核状态</text><span class="info-status" :style="item.standardApprovedName ? getStatusCss(item.standardApprovedName) : ''">{{ item.standardApprovedName || '-' }}</span>
+              <text>标准合同规范性审核状态</text><span class="info-status" :style="item.standardApprovedName ? getStatusCss(item.standardApprovedName) : ''">{{ item.standardApprovedName || '-' }}</span>
             </view>
             </view>
             <view class="info-row">
             <view class="info-row">
               <text>订货日期</text><text>{{ item.orderDate }}</text>
               <text>订货日期</text><text>{{ item.orderDate }}</text>
@@ -103,12 +103,6 @@ export default {
     return {
     return {
       searchKeyword: '',
       searchKeyword: '',
       searchKeywordDebounced: '',
       searchKeywordDebounced: '',
-
-      tabs: [
-        { label: '草稿合同', value: 'DRAFT' },
-        { label: '标准合同', value: 'STANDARD' },
-        { label: '已删除合同', value: 'DELETED' }
-      ],
       status: 'DRAFT',
       status: 'DRAFT',
 
 
       query: { deptId: '', deptName: '', dateRange: [] },
       query: { deptId: '', deptName: '', dateRange: [] },
@@ -126,6 +120,23 @@ export default {
     }
     }
   },
   },
   computed: {
   computed: {
+    roleCodes() {
+      const g = this.$store && this.$store.getters
+      return (g && g.roleCodes) || []
+    },
+    tabs() {
+      if (this.roleCodes.includes('constract_admin')) {
+        return [
+          { label: '草稿合同', value: 'DRAFT' },
+          { label: '标准合同', value: 'STANDARD' },
+          { label: '已删除合同', value: 'DELETED' }
+        ]
+      }
+      return [
+        { label: '草稿合同', value: 'DRAFT' },
+        { label: '标准合同', value: 'STANDARD' }
+      ]
+    },
     extraCombined() {
     extraCombined() {
       return {
       return {
         keyword: this.searchKeywordDebounced || undefined,
         keyword: this.searchKeywordDebounced || undefined,
@@ -359,10 +370,10 @@ export default {
         margin-bottom: 0;
         margin-bottom: 0;
         }
         }
         text {
         text {
-            width: 60%;
+            width: 50%;
             &:last-child {
             &:last-child {
                 color: rgba(0,0,0,0.9);
                 color: rgba(0,0,0,0.9);
-                width: 40%;
+                width: 50%;
             }
             }
         }
         }
     }
     }

@@ -124,7 +124,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.remarks" placeholder="请输入备注" :inputBorder="false" />
+                        <uni-easyinput v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" maxlength="2000" />
                     </template>
                     </template>
                 </uni-list-item>
                 </uni-list-item>
 
 
@@ -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: '',
@@ -223,9 +231,9 @@ export default {
                 executionStandardName: '',
                 executionStandardName: '',
                 executionStandardRemarks: '',
                 executionStandardRemarks: '',
                 includesPackagingFee: false,
                 includesPackagingFee: false,
-                includesPackagingFeeName: '',
+                includesPackagingFeeName: '否',
                 includesTransportFee: false,
                 includesTransportFee: false,
-                includesTransportFeeName: '',
+                includesTransportFeeName: '否',
                 unit: '元、公斤、元/公斤',
                 unit: '元、公斤、元/公斤',
                 totalAmountCapital: '',
                 totalAmountCapital: '',
                 depositInfo: '',
                 depositInfo: '',
@@ -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 />
@@ -123,7 +141,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 type="textarea" v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" />
+                        <uni-easyinput type="textarea" v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" maxlength="2000" />
                     </template>
                     </template>
                 </uni-list-item>
                 </uni-list-item>
                 <view class="quality">
                 <view class="quality">
@@ -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: '',
@@ -233,15 +254,19 @@ export default {
                 executionStandardName: '',
                 executionStandardName: '',
                 executionStandardRemarks: '',
                 executionStandardRemarks: '',
                 includesPackagingFee: false,
                 includesPackagingFee: false,
-                includesPackagingFeeName: '',
+                includesPackagingFeeName: '否',
                 includesTransportFee: false,
                 includesTransportFee: false,
-                includesTransportFeeName: '',
+                includesTransportFeeName: '否',
                 unit: '元、公斤、元/公斤',
                 unit: '元、公斤、元/公斤',
                 totalAmountCapital: '',
                 totalAmountCapital: '',
                 destinationId: [],
                 destinationId: [],
                 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

@@ -4,16 +4,23 @@
             <view class="detail-page">
             <view class="detail-page">
                 <view class="section">
                 <view class="section">
                     <text class="row customer">{{ detail.code }}</text>
                     <text class="row customer">{{ detail.code }}</text>
-                    <view class="row" v-if="status === 'STANDARD'"><text class="label">正式合同规范性审核</text><text class="value"><span class="info-status" :style="detail.standardApprovedName ? getStatusCss(detail.standardApprovedName) : ''" >{{ detail.standardApprovedName || '-' }}</span></text></view>
+                    <view class="row" v-if="detail.status === 'STANDARD'"><text class="label">正式合同规范性审核</text><text class="value"><span class="info-status" :style="detail.standardApprovedName ? getStatusCss(detail.standardApprovedName) : ''" >{{ detail.standardApprovedName || '-' }}</span></text></view>
+                    <view v-if="detail.status === 'STANDARD'" :class="['status', `status_${detail.shippingStatusName}`]" />
                     <view class="row"><text class="label">供方</text><text class="value">{{ detail.supplierName ||
                     <view class="row"><text class="label">供方</text><text class="value">{{ detail.supplierName ||
                             '-'}}</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">
@@ -53,7 +60,7 @@
                     }}</text></view>
                     }}</text></view>
                 </view>
                 </view>
 
 
-                <view class="section" v-if="status === 'STANDARD'">
+                <view class="section" v-if="detail.status === 'STANDARD'">
                     <view class="row"><text class="label">规范性合同</text><text class="value" style="color: #3D48A3;">{{
                     <view class="row"><text class="label">规范性合同</text><text class="value" style="color: #3D48A3;">{{
                         detail.standardFileName || '-' }}</text></view>
                         detail.standardFileName || '-' }}</text></view>
                     <view class="row"><text class="label">合同是否规范</text><text class="value">{{
                     <view class="row"><text class="label">合同是否规范</text><text class="value">{{
@@ -108,11 +115,12 @@
 </template>
 </template>
 
 
 <script>
 <script>
-import { getContractApi, deleteContractApi, uploadStandardContract, statusStyle } from '@/api/contract'
+import { getContractApi, deleteContractApi, uploadStandardContract, statusStyle, statusMap } from '@/api/contract'
 import ProductRel from './productRel.vue'
 import ProductRel from './productRel.vue'
 import DetailButtons from '@/components/detail-buttons/index.vue'
 import DetailButtons from '@/components/detail-buttons/index.vue'
 import FileUpload from '@/components/file-upload/index.vue'
 import FileUpload from '@/components/file-upload/index.vue'
 import SingleSelectSheet from '@/components/single-select/index.vue'
 import SingleSelectSheet from '@/components/single-select/index.vue'
+import { getDicByCodes, getDicName } from '@/utils/dic.js'
 
 
 export default {
 export default {
     name: 'ContractRetailDetail',
     name: 'ContractRetailDetail',
@@ -154,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: '' },
@@ -193,11 +205,12 @@ export default {
             {
             {
                 text: '审核详情',
                 text: '审核详情',
                 visible: true,
                 visible: true,
-                variant: 'primary',
                 event: 'auditDetail'
                 event: 'auditDetail'
             },
             },
             ],
             ],
             statusStyle: statusStyle,
             statusStyle: statusStyle,
+            statusMap: statusMap,
+            dicOptions: { AUDIT_STATUS: [] }
         }
         }
     },
     },
     computed: {
     computed: {
@@ -219,6 +232,7 @@ export default {
         const status = options && options.status ? options.status : ''
         const status = options && options.status ? options.status : ''
         this.id = id
         this.id = id
         this.status = status
         this.status = status
+        this.loadAuditStatusDic()
         this.loadDetail()
         this.loadDetail()
     },
     },
     methods: {
     methods: {
@@ -230,6 +244,20 @@ export default {
             backgroundColor: found.bgColor || '#000'
             backgroundColor: found.bgColor || '#000'
         }
         }
         },
         },
+        async loadAuditStatusDic() {
+            try {
+                const results = await getDicByCodes(['AUDIT_STATUS'])
+                this.dicOptions.AUDIT_STATUS = (results.AUDIT_STATUS && results.AUDIT_STATUS.data) || []
+                this.refreshStandardApprovedName()
+            } catch (e) {
+                this.dicOptions.AUDIT_STATUS = []
+            }
+        },
+        refreshStandardApprovedName() {
+            const code = this.detail && this.detail.standardApproved
+            const name = getDicName('AUDIT_STATUS', code, this.dicOptions.AUDIT_STATUS)
+            this.detail = { ...this.detail, standardApprovedName: name }
+        },
         onUploadSubmit() {
         onUploadSubmit() {
             if (!this.fileInfo.id) {
             if (!this.fileInfo.id) {
                 uni.showToast({
                 uni.showToast({
@@ -362,6 +390,7 @@ export default {
                 }
                 }
                 const lines = Array.isArray(data.contractDistributorLineList) ? data.contractDistributorLineList : []
                 const lines = Array.isArray(data.contractDistributorLineList) ? data.contractDistributorLineList : []
                 this.productList = lines
                 this.productList = lines
+                this.refreshStandardApprovedName()
             } catch (e) {
             } catch (e) {
                 this.detail = { ...this.detail }
                 this.detail = { ...this.detail }
                 this.productList = []
                 this.productList = []
@@ -391,8 +420,35 @@ export default {
     padding: 32rpx;
     padding: 32rpx;
     background: #fff;
     background: #fff;
     margin-bottom: 20rpx;
     margin-bottom: 20rpx;
+    .status {
+    position: absolute;
+    top: 16rpx;
+    right: 52rpx;
+    width: 180rpx;
+    height: 146rpx;
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    background-position: center;
+
+    &_审批中 {
+      background-image: url('~@/static/images/contract/status_1.png');
+    }
+
+    &_生产中 {
+      background-image: url('~@/static/images/contract/status_2.png');
+    }
+
+    &_已发货 {
+      background-image: url('~@/static/images/contract/status_3.png');
+    }
+
+    &_已签收 {
+      background-image: url('~@/static/images/contract/status_4.png');
+    }
+  }
 }
 }
 
 
+
 .section1 {
 .section1 {
     background: #fff;
     background: #fff;
     margin-bottom: 20rpx;
     margin-bottom: 20rpx;

@@ -61,7 +61,7 @@
               <text>订单总额</text><text class="amount" :style="{ color: '#b67a76' }">{{ item.totalAmountIncludingTax ? '¥' : '' }}{{ formatAmount(item.totalAmountIncludingTax) || '-' }}</text>
               <text>订单总额</text><text class="amount" :style="{ color: '#b67a76' }">{{ item.totalAmountIncludingTax ? '¥' : '' }}{{ formatAmount(item.totalAmountIncludingTax) || '-' }}</text>
             </view>
             </view>
             <view class="info-row" v-if="item.status === 'STANDARD'">
             <view class="info-row" v-if="item.status === 'STANDARD'">
-              <text>正式合同规范性审核状态</text><span class="info-status" :style="item.standardApprovedName ? getStatusCss(item.standardApprovedName) : ''">{{ item.standardApprovedName || '-' }}</span>
+              <text>标准合同规范性审核状态</text><span class="info-status" :style="item.standardApprovedName ? getStatusCss(item.standardApprovedName) : ''">{{ item.standardApprovedName || '-' }}</span>
             </view>
             </view>
             <view class="info-row">
             <view class="info-row">
               <text>订货日期</text><text>{{ item.orderDate }}</text>
               <text>订货日期</text><text>{{ item.orderDate }}</text>
@@ -103,21 +103,12 @@ export default {
     return {
     return {
       searchKeyword: '',
       searchKeyword: '',
       searchKeywordDebounced: '',
       searchKeywordDebounced: '',
-
-      tabs: [
-        { label: '草稿合同', value: 'DRAFT' },
-        { label: '标准合同', value: 'STANDARD' },
-        { label: '已删除合同', value: 'DELETED' }
-      ],
       status: 'DRAFT',
       status: 'DRAFT',
-
       query: { deptId: '', deptName: '', dateRange: [] },
       query: { deptId: '', deptName: '', dateRange: [] },
       extraParams: {},
       extraParams: {},
-
       batchMode: false,
       batchMode: false,
       selectedKeys: [],
       selectedKeys: [],
       currentItems: [],
       currentItems: [],
-
       filterVisible: false,
       filterVisible: false,
       filterForm: { deptId: '', deptName: '', dateRange: [] },
       filterForm: { deptId: '', deptName: '', dateRange: [] },
       deptSelectVisible: false,
       deptSelectVisible: false,
@@ -126,6 +117,23 @@ export default {
     }
     }
   },
   },
   computed: {
   computed: {
+    roleCodes() {
+      const g = this.$store && this.$store.getters
+      return (g && g.roleCodes) || []
+    },
+    tabs() {
+      if (this.roleCodes.includes('constract_admin')) {
+        return [
+          { label: '草稿合同', value: 'DRAFT' },
+          { label: '标准合同', value: 'STANDARD' },
+          { label: '已删除合同', value: 'DELETED' }
+        ]
+      }
+      return [
+        { label: '草稿合同', value: 'DRAFT' },
+        { label: '标准合同', value: 'STANDARD' }
+      ]
+    },
     extraCombined() {
     extraCombined() {
       return {
       return {
         keyword: this.searchKeywordDebounced || undefined,
         keyword: this.searchKeywordDebounced || undefined,
@@ -359,10 +367,10 @@ export default {
         margin-bottom: 0;
         margin-bottom: 0;
         }
         }
         text {
         text {
-            width: 60%;
+            width: 50%;
             &:last-child {
             &:last-child {
                 color: rgba(0,0,0,0.9);
                 color: rgba(0,0,0,0.9);
-                width: 40%;
+                width: 50%;
             }
             }
         }
         }
     }
     }

@@ -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>
@@ -124,7 +139,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.remarks" placeholder="请输入备注" :inputBorder="false" />
+                        <uni-easyinput v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" maxlength="2000" />
                     </template>
                     </template>
                 </uni-list-item>
                 </uni-list-item>
 
 
@@ -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: '',
@@ -223,9 +246,9 @@ export default {
                 executionStandardName: '',
                 executionStandardName: '',
                 executionStandardRemarks: '',
                 executionStandardRemarks: '',
                 includesPackagingFee: false,
                 includesPackagingFee: false,
-                includesPackagingFeeName: '',
+                includesPackagingFeeName: '否',
                 includesTransportFee: false,
                 includesTransportFee: false,
-                includesTransportFeeName: '',
+                includesTransportFeeName: '否',
                 unit: '元、公斤、元/公斤',
                 unit: '元、公斤、元/公斤',
                 totalAmountCapital: '',
                 totalAmountCapital: '',
                 depositInfo: '',
                 depositInfo: '',
@@ -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 />
@@ -123,7 +139,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 type="textarea" v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" />
+                        <uni-easyinput type="textarea" v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" maxlength="2000" />
                     </template>
                     </template>
                 </uni-list-item>
                 </uni-list-item>
                 <view class="quality">
                 <view class="quality">
@@ -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: '',
@@ -233,15 +252,19 @@ export default {
                 executionStandardName: '',
                 executionStandardName: '',
                 executionStandardRemarks: '',
                 executionStandardRemarks: '',
                 includesPackagingFee: false,
                 includesPackagingFee: false,
-                includesPackagingFeeName: '',
+                includesPackagingFeeName: '否',
                 includesTransportFee: false,
                 includesTransportFee: false,
-                includesTransportFeeName: '',
+                includesTransportFeeName: '否',
                 unit: '元、公斤、元/公斤',
                 unit: '元、公斤、元/公斤',
                 totalAmountCapital: '',
                 totalAmountCapital: '',
                 destinationId: [],
                 destinationId: [],
                 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

@@ -4,16 +4,32 @@
             <view class="detail-page">
             <view class="detail-page">
                 <view class="section">
                 <view class="section">
                     <text class="row customer">{{ detail.code }}</text>
                     <text class="row customer">{{ detail.code }}</text>
-                    <view class="row" v-if="detail.status === 'STANDARD' || detail.status === 'FORMAL'"><text class="label">{{ detail.status === 'STANDARD' ? '标准合同' : '正式合同' }}规范性审核状态</text><text class="value"><span class="info-status" :style="detail.standardApprovedName ? getStatusCss(detail.standardApprovedName) : ''" >{{ detail.standardApprovedName || '-' }}</span></text></view>
+                    <view class="row" v-if="detail.status === 'STANDARD' || detail.status === 'FORMAL'">
+                        <text class="label">{{ detail.status === 'STANDARD' ? '标准合同' : '正式合同' }}规范性审核状态</text>
+                        <text class="value">
+
+                            <span v-if="detail.status === 'STANDARD'" class="info-status" :style="detail.standardApprovedName ? getStatusCss(detail.standardApprovedName) : ''" >{{ detail.standardApprovedName || '-' }}</span>
+                            <span v-if="detail.status === 'FORMAL'" class="info-status" :style="detail.formalApprovedName ? getStatusCss(detail.formalApprovedName) : ''" >{{ detail.formalApprovedName || '-' }}</span>
+                            
+                        </text>
+                    </view>                    
+                    <view v-if="detail.status === 'STANDARD'" :class="['status', `status_${detail.shippingStatusName}`]" />                    
                     <view class="row"><text class="label">供方</text><text class="value">{{ detail.supplierName || '-'
                     <view class="row"><text class="label">供方</text><text class="value">{{ detail.supplierName || '-'
                             }}</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">
@@ -108,7 +124,8 @@
 </template>
 </template>
 
 
 <script>
 <script>
-import { getContractApi, deleteContractApi, uploadFormalContract, uploadStandardContract, statusStyle } from '@/api/contract'
+import { getContractApi, deleteContractApi, uploadFormalContract, uploadStandardContract, statusStyle, statusMap } from '@/api/contract'
+import { fillStandardApprovedName, fillFormalApprovedName } from '@/utils/dic.js'
 import ProductRel from './productRel.vue'
 import ProductRel from './productRel.vue'
 import DetailButtons from '@/components/detail-buttons/index.vue'
 import DetailButtons from '@/components/detail-buttons/index.vue'
 import FileUpload from '@/components/file-upload/index.vue'
 import FileUpload from '@/components/file-upload/index.vue'
@@ -130,6 +147,11 @@ export default {
                 supplierName: '',
                 supplierName: '',
                 buyer: '',
                 buyer: '',
                 buyerName: '',
                 buyerName: '',
+                stockUpCompanyId: '',
+                stockUpCompanyName: '',
+                deptName: '',
+                region: '',
+                regionName: '',
                 orderDate: '',
                 orderDate: '',
                 unit: '',
                 unit: '',
                 workshopId: '',
                 workshopId: '',
@@ -162,6 +184,7 @@ export default {
             },
             },
             productList: [],
             productList: [],
             statusStyle: statusStyle,
             statusStyle: statusStyle,
+            statusMap: statusMap,
           buttons: [{
           buttons: [{
             text: '编辑',
             text: '编辑',
             visible: true,
             visible: true,
@@ -223,19 +246,16 @@ export default {
           {
           {
             text: '正式合同审核详情',
             text: '正式合同审核详情',
             visible: true,
             visible: true,
-            variant: 'primary',
             event: 'auditDetail1'
             event: 'auditDetail1'
           },
           },
           {
           {
             text: '正式合同审核详情',
             text: '正式合同审核详情',
             visible: true,
             visible: true,
-            variant: 'primary',
             event: 'auditDetail2'
             event: 'auditDetail2'
           },
           },
           {
           {
             text: '标准合同审核详情',
             text: '标准合同审核详情',
             visible: true,
             visible: true,
-            variant: 'primary',
             event: 'auditDetail3'
             event: 'auditDetail3'
           },
           },
         ],
         ],
@@ -260,7 +280,7 @@ export default {
           { ...this.buttons[5], visible: (s === 'STANDARD' && a !== 'AUDIT' && a !== 'PASS' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:standard-upload')) },
           { ...this.buttons[5], visible: (s === 'STANDARD' && a !== 'AUDIT' && a !== 'PASS' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:standard-upload')) },
           { ...this.buttons[6], visible: (s === 'FORMAL' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:approve')) },
           { ...this.buttons[6], visible: (s === 'FORMAL' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:approve')) },
           { ...this.buttons[7], visible: (s === 'STANDARD' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:approve')) },
           { ...this.buttons[7], visible: (s === 'STANDARD' && e && t === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:approve')) },
-          { ...this.buttons[8], visible: (s === 'STANDARD' && f && a === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:restandard-approveview')) },
+          { ...this.buttons[8], visible: (s === 'STANDARD' && f && a === 'AUDIT' && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:standard-approve')) },
           { ...this.buttons[9], visible: (s === 'FORMAL' && t && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:review')) },
           { ...this.buttons[9], visible: (s === 'FORMAL' && t && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:review')) },
           { ...this.buttons[10], visible: (s === 'STANDARD' && t && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:review')) },
           { ...this.buttons[10], visible: (s === 'STANDARD' && t && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:review')) },
           { ...this.buttons[11], visible: (s === 'STANDARD' && a && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:standard-review')) },
           { ...this.buttons[11], visible: (s === 'STANDARD' && a && this.$auth.hasPermi('contract-manage:distribution-inventory-contract:standard-review')) },
@@ -425,6 +445,8 @@ export default {
                     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}` : '',
                 }
                 }
+                this.detail = await fillStandardApprovedName(this.detail)
+                this.detail = await fillFormalApprovedName(this.detail)
                 const lines = Array.isArray(data.contractDistributorLineList) ? data.contractDistributorLineList : []
                 const lines = Array.isArray(data.contractDistributorLineList) ? data.contractDistributorLineList : []
                 this.productList = lines
                 this.productList = lines
             } catch (e) {
             } catch (e) {
@@ -470,6 +492,32 @@ export default {
     padding: 32rpx;
     padding: 32rpx;
     background: #fff;
     background: #fff;
     margin-bottom: 20rpx;
     margin-bottom: 20rpx;
+    .status {
+    position: absolute;
+    top: 16rpx;
+    right: 52rpx;
+    width: 180rpx;
+    height: 146rpx;
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    background-position: center;
+
+    &_审批中 {
+      background-image: url('~@/static/images/contract/status_1.png');
+    }
+
+    &_生产中 {
+      background-image: url('~@/static/images/contract/status_2.png');
+    }
+
+    &_已发货 {
+      background-image: url('~@/static/images/contract/status_3.png');
+    }
+
+    &_已签收 {
+      background-image: url('~@/static/images/contract/status_4.png');
+    }
+  }
 }
 }
 .section1 {
 .section1 {
     background: #fff;
     background: #fff;
@@ -547,4 +595,4 @@ export default {
     color: rgba(0, 0, 0, 0.6);
     color: rgba(0, 0, 0, 0.6);
     font-size: 32rpx;
     font-size: 32rpx;
 }
 }
-</style>
+</style>

@@ -105,13 +105,6 @@ export default {
     return {
     return {
       searchKeyword: '',
       searchKeyword: '',
       searchKeywordDebounced: '',
       searchKeywordDebounced: '',
-
-      tabs: [
-        { label: '草稿合同', value: 'DRAFT' },
-        { label: '正式合同', value: 'FORMAL' },
-        { label: '标准合同', value: 'STANDARD' },
-        { label: '已删除合同', value: 'DELETED' }
-      ],
       status: 'DRAFT',
       status: 'DRAFT',
 
 
       query: { deptId: '', deptName: '', dateRange: [] },
       query: { deptId: '', deptName: '', dateRange: [] },
@@ -129,6 +122,25 @@ export default {
     }
     }
   },
   },
   computed: {
   computed: {
+    roleCodes() {
+      const g = this.$store && this.$store.getters
+      return (g && g.roleCodes) || []
+    },
+    tabs() {
+      if (this.roleCodes.includes('constract_admin')) {
+        return [
+          { label: '草稿合同', value: 'DRAFT' },
+          { label: '正式合同', value: 'FORMAL' },
+          { label: '标准合同', value: 'STANDARD' },
+          { label: '已删除合同', value: 'DELETED' }
+        ]
+      }
+      return [
+        { label: '草稿合同', value: 'DRAFT' },
+        { label: '正式合同', value: 'FORMAL' },
+        { label: '标准合同', value: 'STANDARD' }
+      ]
+    },
     extraCombined() {
     extraCombined() {
       return {
       return {
         keyword: this.searchKeywordDebounced || undefined,
         keyword: this.searchKeywordDebounced || undefined,
@@ -361,10 +373,10 @@ export default {
         margin-bottom: 0;
         margin-bottom: 0;
         }
         }
         text {
         text {
-            width: 60%;
+            width: 50%;
             &:last-child {
             &:last-child {
                 color: rgba(0,0,0,0.9);
                 color: rgba(0,0,0,0.9);
-                width: 40%;
+                width: 50%;
             }
             }
         }
         }
     }
     }

@@ -40,9 +40,30 @@
                                 <uni-easyinput v-model="item.quality" placeholder="请输入品质" :clearable="false" disabled />
                                 <uni-easyinput v-model="item.quality" placeholder="请输入品质" :clearable="false" disabled />
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
-                        <uni-list-item title="规格">
+                        <uni-list-item title="规格(mm)">
                             <template v-slot:footer>
                             <template v-slot:footer>
-                                <uni-easyinput v-model="item.specDisplay" placeholder="自动拼接规格" :clearable="false" disabled />
+                                <!-- <uni-easyinput v-model="item.specDisplay" placeholder="自动拼接规格" :clearable="false" disabled /> -->
+                                 <view class="value value-spec">
+                            <view v-if="item.thickness" class="value-spec_val">{{ item.thickness }}</view>
+                            <view v-if="item.thickness" class="value-spec_box">
+                                <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }}
+                                </view>
+                                <view v-if="item.thicknessTolNeg" class="value-spec_box_2">-{{ item.thicknessTolNeg }}
+                                </view>
+                            </view>
+                            <view v-if="item.width" class="value-spec_val p12">*</view>
+                            <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
+                            <view v-if="item.width" class="value-spec_box">
+                                <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view>
+                                <view v-if="item.widthTolNeg" class="value-spec_box_2">-{{ item.widthTolNeg }}</view>
+                            </view>
+                            <view v-if="item.length" class="value-spec_val p12">*</view>
+                            <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
+                            <view v-if="item.length" class="value-spec_box">
+                                <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view>
+                                <view v-if="item.lengthTolNeg" class="value-spec_box_2">-{{ item.lengthTolNeg }}</view>
+                            </view>
+                        </view>
                             </template>
                             </template>
                         </uni-list-item>
                         </uni-list-item>
                         <uni-list-item title="状态">
                         <uni-list-item title="状态">
@@ -699,4 +720,42 @@ export default {
     background: $theme-primary;
     background: $theme-primary;
     color: #fff;
     color: #fff;
 }
 }
+.value-spec {
+        height: 48rpx;
+        display: flex;
+        align-items: center;
+        color: #000000;
+        // justify-content: end;
+        &_box {
+            position: relative;
+            width: 60rpx;
+            height: 48rpx;
+
+            &_1 {
+                font-size: 16rpx;
+                position: absolute;
+                top: -10rpx;
+                left: 0;
+            }
+
+            &_2 {
+                font-size: 16rpx;
+                position: absolute;
+                bottom: -10rpx;
+                left: 0;
+            }
+        }
+
+        &_val {
+            font-size: 28rpx;
+
+            &.p12 {
+                padding-right: 12rpx;
+            }
+        }
+    }
+        .row-spec {
+            height: 60rpx;
+            align-items: center;
+        }
 </style>
 </style>

@@ -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>
@@ -124,7 +142,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.remarks" placeholder="请输入备注" :inputBorder="false" />
+                        <uni-easyinput v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" maxlength="2000" />
                     </template>
                     </template>
                 </uni-list-item>
                 </uni-list-item>
 
 
@@ -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: '',
@@ -223,9 +248,9 @@ export default {
                 executionStandardName: '',
                 executionStandardName: '',
                 executionStandardRemarks: '',
                 executionStandardRemarks: '',
                 includesPackagingFee: false,
                 includesPackagingFee: false,
-                includesPackagingFeeName: '',
+                includesPackagingFeeName: '否',
                 includesTransportFee: false,
                 includesTransportFee: false,
-                includesTransportFeeName: '',
+                includesTransportFeeName: '否',
                 unit: '元、公斤、元/公斤',
                 unit: '元、公斤、元/公斤',
                 totalAmountCapital: '',
                 totalAmountCapital: '',
                 depositInfo: '',
                 depositInfo: '',
@@ -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: '' }
         },
         },

@@ -339,11 +339,11 @@ export default {
     }
     }
 
 
     text {
     text {
-      width: 60%;
+      width: 50%;
 
 
       &:last-child {
       &:last-child {
         color: rgba(0, 0, 0, 0.9);
         color: rgba(0, 0, 0, 0.9);
-        width: 40%;
+        width: 50%;
       }
       }
     }
     }
   }
   }

@@ -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 />
@@ -123,7 +141,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 type="textarea" v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" />
+                        <uni-easyinput type="textarea" v-model="form.remarks" placeholder="请输入备注" :inputBorder="false" maxlength="2000" />
                     </template>
                     </template>
                 </uni-list-item>
                 </uni-list-item>
                 <view class="quality">
                 <view class="quality">
@@ -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: '',
@@ -233,15 +254,19 @@ export default {
                 executionStandardName: '',
                 executionStandardName: '',
                 executionStandardRemarks: '',
                 executionStandardRemarks: '',
                 includesPackagingFee: false,
                 includesPackagingFee: false,
-                includesPackagingFeeName: '',
+                includesPackagingFeeName: '否',
                 includesTransportFee: false,
                 includesTransportFee: false,
-                includesTransportFeeName: '',
+                includesTransportFeeName: '否',
                 unit: '元、公斤、元/公斤',
                 unit: '元、公斤、元/公斤',
                 totalAmountCapital: '',
                 totalAmountCapital: '',
                 destinationId: [],
                 destinationId: [],
                 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