朱园亮 / erp-mobile · Commits

Commit cd155724e4b0176ee928ce495161f3e8f3e1d382

Authored by gesilong
1 parent 19bd388b

Changes: 合同增加 办事处、区域字段、备货单位/人（生产标准）

Inline Side-by-side
Showing 29 changed files with 1401 additions and 130 deletions
@@ -19,6 +19,15 @@ export const statusMap = { @@ -19,6 +19,15 @@ export const statusMap = {
19 } 19 }
20 20
21 const baseUrl = '/contract'; 21 const baseUrl = '/contract';
  22 +// 查询当前人所在办事处
  23 +export function getDeptApi(params) {
  24 + return request({
  25 + url: `/system/dept/getDept`,
  26 + method: 'get',
  27 + params
  28 + })
  29 +}
  30 +
22 // 查询合同框架列表 31 // 查询合同框架列表
23 export function queryApi(params) { 32 export function queryApi(params) {
24 return request({ 33 return request({
@@ -21,7 +21,12 @@ @@ -21,7 +21,12 @@
21 <view class="item-title"><text class="required">*</text><text>需方</text></view> 21 <view class="item-title"><text class="required">*</text><text>需方</text></view>
22 </template> 22 </template>
23 </uni-list-item> 23 </uni-list-item>
24 - 24 + <uni-list-item class="select-item" :class="form.stockUpCompanyId ? 'is-filled' : 'is-empty'" clickable
  25 + @click="openRelate('stockUpCompanyId')" :rightText="form.stockUpCompanyName || '请选择备货单位'" showArrow>
  26 + <template v-slot:body>
  27 + <view class="item-title"><text class="required">*</text><text>备货单位/人（生产标准）</text></view>
  28 + </template>
  29 + </uni-list-item>
25 <uni-list-item title="订货日期"> 30 <uni-list-item title="订货日期">
26 <template v-slot:footer> 31 <template v-slot:footer>
27 <uni-datetime-picker type="date" v-model="form.orderDate" /> 32 <uni-datetime-picker type="date" v-model="form.orderDate" />
@@ -39,7 +44,23 @@ @@ -39,7 +44,23 @@
39 <view class="item-title"><text class="required">*</text><text>生产厂</text></view> 44 <view class="item-title"><text class="required">*</text><text>生产厂</text></view>
40 </template> 45 </template>
41 </uni-list-item> 46 </uni-list-item>
42 - <ProductRel mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" @change="onProductsChange" :options="productList" /> 47 + <uni-list-item class="select-item" :class="form.deptName ? 'is-filled' : 'is-empty'">
  48 + <template v-slot:body>
  49 + <view class="item-title"><text class="required">*</text><text>办事处</text></view>
  50 + </template>
  51 + <template v-slot:footer>
  52 + <view class="serial-number-row">
  53 + <uni-easyinput v-model="form.deptName" :inputBorder="false" disabled />
  54 + </view>
  55 + </template>
  56 + </uni-list-item>
  57 + <uni-list-item class="select-item" :class="form.region ? 'is-filled' : 'is-empty'" clickable
  58 + @click="openSheet('region')" :rightText="displayLabel('regionName')" showArrow>
  59 + <template v-slot:body>
  60 + <view class="item-title"><text class="required">*</text><text>区域</text></view>
  61 + </template>
  62 + </uni-list-item>
  63 + <ProductRel ref="productRel" mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" @change="onProductsChange" :options="productList" />
43 <uni-list-item title="合计人民币金额（大写）"> 64 <uni-list-item title="合计人民币金额（大写）">
44 <template v-slot:footer> 65 <template v-slot:footer>
45 <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false" disabled /> 66 <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false" disabled />
@@ -208,10 +229,12 @@ import SingleSelectSheet from '@/components/single-select/index.vue' @@ -208,10 +229,12 @@ import SingleSelectSheet from '@/components/single-select/index.vue'
208 import RelateSelectSheet from '@/components/relate-select/index.vue' 229 import RelateSelectSheet from '@/components/relate-select/index.vue'
209 import ProductRel from './productRel.vue' 230 import ProductRel from './productRel.vue'
210 import CitySelector from '@/components/city-selector/index.vue' 231 import CitySelector from '@/components/city-selector/index.vue'
211 -import { getRetailCodeApi, createContractApi, getCustomerRemarks,getCustomerSpecificQualityRequirements } from '@/api/contract' 232 +import { getRetailCodeApi, createContractApi, getCustomerRemarks,getCustomerSpecificQualityRequirements,getDeptApi } from '@/api/contract'
212 import { getDicByCodes } from '@/utils/dic' 233 import { getDicByCodes } from '@/utils/dic'
213 import { formatCurrencyToChinese } from '@/utils/common' 234 import { formatCurrencyToChinese } from '@/utils/common'
214 import { workshopQueryApi } from '@/api/devManage' 235 import { workshopQueryApi } from '@/api/devManage'
  236 +import { getArea } from '@/api/credit_manage.js'
  237 +
215 238
216 export default { 239 export default {
217 name: 'AddContractForeignStd', 240 name: 'AddContractForeignStd',
@@ -223,7 +246,11 @@ export default { @@ -223,7 +246,11 @@ export default {
223 supplier: '', 246 supplier: '',
224 supplierName: '', 247 supplierName: '',
225 buyer: '', 248 buyer: '',
  249 + region: '',
  250 + regionName: '',
226 buyerName: '', 251 buyerName: '',
  252 + stockUpCompanyId: '',
  253 + stockUpCompanyName: '',
227 orderDate: '', 254 orderDate: '',
228 deliveryDate: '', 255 deliveryDate: '',
229 designatedConsignee: '', 256 designatedConsignee: '',
@@ -249,6 +276,8 @@ export default { @@ -249,6 +276,8 @@ export default {
249 pieceWeightHead: '', 276 pieceWeightHead: '',
250 surface: '', 277 surface: '',
251 tolerance: '', 278 tolerance: '',
  279 + deptName: '',
  280 + deptId: '',
252 }, 281 },
253 supplierList: [], 282 supplierList: [],
254 specialTermsList: [], 283 specialTermsList: [],
@@ -263,12 +292,15 @@ export default { @@ -263,12 +292,15 @@ export default {
263 productList: [], 292 productList: [],
264 customerRemarks: [], 293 customerRemarks: [],
265 defaultRemark: '', 294 defaultRemark: '',
  295 + regionOptions: [],
266 } 296 }
267 }, 297 },
268 created() { 298 created() {
269 this.loadSuppliers() 299 this.loadSuppliers()
270 this.loadExtraOptions() 300 this.loadExtraOptions()
271 this.initCode() 301 this.initCode()
  302 + this.getDept()
  303 + this.loadRegionOptions()
272 this.form.orderDate = this.formatDate(new Date()) 304 this.form.orderDate = this.formatDate(new Date())
273 this.$nextTick(() => { 305 this.$nextTick(() => {
274 if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) { 306 if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
@@ -318,6 +350,24 @@ export default { @@ -318,6 +350,24 @@ export default {
318 }, 350 },
319 }, 351 },
320 methods: { 352 methods: {
  353 + async loadRegionOptions() {
  354 + try {
  355 + const res = await getArea()
  356 + const list = res.data || []
  357 + this.regionOptions = (list || []).map(it => ({ label: it.name || '', value: it.id || '' }))
  358 + } catch (e) {
  359 + this.regionOptions = []
  360 + }
  361 + },
  362 + // 查询当前人所在办事处
  363 + getDept() {
  364 + getDeptApi().then(res => {
  365 + if (res.code === 200) {
  366 + this.form.deptName = res.data.name || ''
  367 + this.form.deptId = res.data.id || ''
  368 + }
  369 + })
  370 + },
321 getHistory() { 371 getHistory() {
322 if (!this.productLineList.length || !this.productLineList[0].productId) { 372 if (!this.productLineList.length || !this.productLineList[0].productId) {
323 return; 373 return;
@@ -403,7 +453,7 @@ export default { @@ -403,7 +453,7 @@ export default {
403 }, 453 },
404 displayLabel(field) { 454 displayLabel(field) {
405 const m = this.form 455 const m = this.form
406 - const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopIdName: '请选择生产厂' } 456 + const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopIdName: '请选择生产厂', regionName: '请选择区域' }
407 const val = m[field] 457 const val = m[field]
408 return val ? String(val) : map[field] 458 return val ? String(val) : map[field]
409 }, 459 },
@@ -448,6 +498,8 @@ export default { @@ -448,6 +498,8 @@ export default {
448 setSheet('单价中是否已包含运费', this.yesNoList) 498 setSheet('单价中是否已包含运费', this.yesNoList)
449 } else if (field === 'historyRemarks') { 499 } else if (field === 'historyRemarks') {
450 setSheet('历史备注', this.customerRemarks) 500 setSheet('历史备注', this.customerRemarks)
  501 + }else if (field === 'region') {
  502 + setSheet('区域', this.regionOptions)
451 } 503 }
452 }, 504 },
453 onSheetConfirm({ value, label }) { 505 onSheetConfirm({ value, label }) {
@@ -466,6 +518,8 @@ export default { @@ -466,6 +518,8 @@ export default {
466 let config = {} 518 let config = {}
467 if (fieldKey === 'buyer') { 519 if (fieldKey === 'buyer') {
468 config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] } 520 config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
  521 + } else if (fieldKey === 'stockUpCompanyId') {
  522 + config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
469 } 523 }
470 const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : [] 524 const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
471 this.sheet.visible = false 525 this.sheet.visible = false
@@ -476,7 +530,17 @@ export default { @@ -476,7 +530,17 @@ export default {
476 const _fieldKey = this.relate.fieldKey 530 const _fieldKey = this.relate.fieldKey
477 const first = (items && items.length > 0) ? items[0] : null 531 const first = (items && items.length > 0) ? items[0] : null
478 this.form[_fieldKey] = (first && first.id) ? first.id : '' 532 this.form[_fieldKey] = (first && first.id) ? first.id : ''
479 - this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : '' 533 +
  534 + if (_fieldKey === 'stockUpCompanyId') {
  535 + this.form.stockUpCompanyName = (first && first.name) ? first.name : ''
  536 + } else {
  537 + this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : ''
  538 + }
  539 +
  540 + if (_fieldKey === 'buyer') {
  541 + this.form.stockUpCompanyId = (first && first.id) ? first.id : ''
  542 + this.form.stockUpCompanyName = (first && first.name) ? first.name : ''
  543 + }
480 }, 544 },
481 onRadioSelect(field, nameField, opt) { 545 onRadioSelect(field, nameField, opt) {
482 const val = opt && opt.value != null ? opt.value : '' 546 const val = opt && opt.value != null ? opt.value : ''
@@ -532,10 +596,12 @@ export default { @@ -532,10 +596,12 @@ export default {
532 { key: 'code', label: '编号' }, 596 { key: 'code', label: '编号' },
533 { key: 'supplier', label: '供方' }, 597 { key: 'supplier', label: '供方' },
534 { key: 'buyer', label: '需方' }, 598 { key: 'buyer', label: '需方' },
  599 + { key: 'stockUpCompanyId', label: '备货单位/人（生产标准）' },
535 { key: 'orderDate', label: '订货日期' }, 600 { key: 'orderDate', label: '订货日期' },
536 { key: 'unit', label: '单位' }, 601 { key: 'unit', label: '单位' },
537 { key: 'workshopId', label: '生产厂' }, 602 { key: 'workshopId', label: '生产厂' },
538 { key: 'specialTerms', label: '特别条款要求' }, 603 { key: 'specialTerms', label: '特别条款要求' },
  604 + { key: 'region', label: '区域' },
539 ] 605 ]
540 for (const it of checks) { 606 for (const it of checks) {
541 const val = this.form[it.key] 607 const val = this.form[it.key]
@@ -561,6 +627,7 @@ export default { @@ -561,6 +627,7 @@ export default {
561 uni.showToast({ title: `第${idx + 1}条明细未完整填写`, icon: 'none' }); return false 627 uni.showToast({ title: `第${idx + 1}条明细未完整填写`, icon: 'none' }); return false
562 } 628 }
563 } 629 }
  630 + if (this.$refs.productRel && !this.$refs.productRel.validate()) return false
564 return true 631 return true
565 } 632 }
566 } 633 }
@@ -9,11 +9,17 @@ @@ -9,11 +9,17 @@
9 }}</text></view> 9 }}</text></view>
10 <view class="row"><text class="label">需方</text><text class="value">{{ detail.buyerName || '-' 10 <view class="row"><text class="label">需方</text><text class="value">{{ detail.buyerName || '-'
11 }}</text></view> 11 }}</text></view>
  12 + <view class="row"><text class="label">备货单位/人（生产标准）</text><text class="value">{{ detail.stockUpCompanyName || '-'
  13 + }}</text></view>
12 <view class="row"><text class="label">订货日期</text><text class="value">{{ detail.orderDate }}</text> 14 <view class="row"><text class="label">订货日期</text><text class="value">{{ detail.orderDate }}</text>
13 </view> 15 </view>
14 <view class="row"><text class="label">单位</text><text class="value">{{ detail.unit }}</text></view> 16 <view class="row"><text class="label">单位</text><text class="value">{{ detail.unit }}</text></view>
15 <view class="row"><text class="label">生产厂</text><text class="value">{{ detail.workshopName || '-' 17 <view class="row"><text class="label">生产厂</text><text class="value">{{ detail.workshopName || '-'
16 }}</text></view> 18 }}</text></view>
  19 + <view class="row"><text class="label">办事处</text><text class="value">{{ detail.deptName || '-'
  20 + }}</text></view>
  21 + <view class="row"><text class="label">区域</text><text class="value">{{ detail.regionName || '-'
  22 + }}</text></view>
17 </view> 23 </view>
18 24
19 <view class="section1"> 25 <view class="section1">
@@ -130,10 +136,15 @@ export default { @@ -130,10 +136,15 @@ export default {
130 supplierName: '', 136 supplierName: '',
131 buyer: '', 137 buyer: '',
132 buyerName: '', 138 buyerName: '',
  139 + stockUpCompanyId: '',
  140 + stockUpCompanyName: '',
133 orderDate: '', 141 orderDate: '',
134 unit: '', 142 unit: '',
135 workshopId: '', 143 workshopId: '',
136 workshopName: '', 144 workshopName: '',
  145 + region: '',
  146 + regionName: '',
  147 + deptName: '',
137 designatedConsignee: '', 148 designatedConsignee: '',
138 specialTerms: '', 149 specialTerms: '',
139 specialTermsName: '', 150 specialTermsName: '',
@@ -211,7 +222,7 @@ export default { @@ -211,7 +222,7 @@ export default {
211 const t = this.detail.standardApproved || false 222 const t = this.detail.standardApproved || false
212 const e = this.detail.standardShowExamine || false 223 const e = this.detail.standardShowExamine || false
213 return [ 224 return [
214 - { ...this.buttons[0], visible: (s === 'DRAFT' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:modifyx')) }, 225 + { ...this.buttons[0], visible: (s === 'DRAFT' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:modify')) },
215 { ...this.buttons[1], visible: (s === 'DRAFT' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:delete')) }, 226 { ...this.buttons[1], visible: (s === 'DRAFT' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:delete')) },
216 { ...this.buttons[2], visible: (s !== 'DELETED' && t !== 'AUDIT' && t !== 'PASS' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:upload')) }, 227 { ...this.buttons[2], visible: (s !== 'DELETED' && t !== 'AUDIT' && t !== 'PASS' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:upload')) },
217 { ...this.buttons[3], visible: (s === 'STANDARD' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:upload-seal')) }, 228 { ...this.buttons[3], visible: (s === 'STANDARD' && this.$auth.hasPermi('contract-manage:foreign-trade-standard-contract:upload-seal')) },
@@ -369,6 +380,9 @@ export default { @@ -369,6 +380,9 @@ export default {
369 this.detail = { 380 this.detail = {
370 ...this.detail, 381 ...this.detail,
371 ...data, 382 ...data,
  383 + stockUpCompanyName: data.stockUpCompanyName || '',
  384 + regionName: data.regionName || '',
  385 + deptName: data.deptName || '',
372 includesPackagingFeeName, includesTransportFeeName, 386 includesPackagingFeeName, includesTransportFeeName,
373 destinationId: data.provinceId && data.cityId && data.districtId ? [data.provinceId, data.cityId, data.districtId] : '', 387 destinationId: data.provinceId && data.cityId && data.districtId ? [data.provinceId, data.cityId, data.districtId] : '',
374 destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '', 388 destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '',
@@ -21,6 +21,12 @@ @@ -21,6 +21,12 @@
21 <view class="item-title"><text class="required">*</text><text>需方</text></view> 21 <view class="item-title"><text class="required">*</text><text>需方</text></view>
22 </template> 22 </template>
23 </uni-list-item> 23 </uni-list-item>
  24 + <uni-list-item class="select-item" :class="form.stockUpCompanyId ? 'is-filled' : 'is-empty'" clickable
  25 + @click="openRelate('stockUpCompanyId')" :rightText="form.stockUpCompanyName || '请选择备货单位'" showArrow>
  26 + <template v-slot:body>
  27 + <view class="item-title"><text class="required">*</text><text>备货单位/人（生产标准）</text></view>
  28 + </template>
  29 + </uni-list-item>
24 30
25 <uni-list-item class="select-item" :class="form.workshopId ? 'is-filled' : 'is-empty'" clickable 31 <uni-list-item class="select-item" :class="form.workshopId ? 'is-filled' : 'is-empty'" clickable
26 @click="openSheet('workshopId')" :rightText="form.workshopName || '请选择生产厂'" showArrow> 32 @click="openSheet('workshopId')" :rightText="form.workshopName || '请选择生产厂'" showArrow>
@@ -28,6 +34,22 @@ @@ -28,6 +34,22 @@
28 <view class="item-title"><text class="required">*</text><text>生产厂</text></view> 34 <view class="item-title"><text class="required">*</text><text>生产厂</text></view>
29 </template> 35 </template>
30 </uni-list-item> 36 </uni-list-item>
  37 + <uni-list-item class="select-item" :class="form.deptName ? 'is-filled' : 'is-empty'">
  38 + <template v-slot:body>
  39 + <view class="item-title"><text class="required">*</text><text>办事处</text></view>
  40 + </template>
  41 + <template v-slot:footer>
  42 + <view class="serial-number-row">
  43 + <uni-easyinput v-model="form.deptName" :inputBorder="false" disabled />
  44 + </view>
  45 + </template>
  46 + </uni-list-item>
  47 + <uni-list-item class="select-item" :class="form.region ? 'is-filled' : 'is-empty'" clickable
  48 + @click="openSheet('region')" :rightText="displayLabel('regionName')" showArrow>
  49 + <template v-slot:body>
  50 + <view class="item-title"><text class="required">*</text><text>区域</text></view>
  51 + </template>
  52 + </uni-list-item>
31 53
32 <uni-list-item title="订货日期"> 54 <uni-list-item title="订货日期">
33 <template v-slot:footer> 55 <template v-slot:footer>
@@ -40,7 +62,7 @@ @@ -40,7 +62,7 @@
40 <uni-easyinput v-model="form.unit" :inputBorder="false" disabled /> 62 <uni-easyinput v-model="form.unit" :inputBorder="false" disabled />
41 </template> 63 </template>
42 </uni-list-item> 64 </uni-list-item>
43 - <ProductRel mode="add" :deliveryDateBase="form.deliveryDate" :deliveryDate="form.orderDate" :list="productLineList" @change="onProductsChange" :options="productList" /> 65 + <ProductRel ref="productRel" mode="add" :deliveryDateBase="form.deliveryDate" :deliveryDate="form.orderDate" :list="productLineList" @change="onProductsChange" :options="productList" />
44 <uni-list-item title="合计人民币金额（大写）"> 66 <uni-list-item title="合计人民币金额（大写）">
45 <template v-slot:footer> 67 <template v-slot:footer>
46 <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false" 68 <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false"
@@ -196,6 +218,7 @@ import { getContractApi, updateContractApi } from '@/api/contract' @@ -196,6 +218,7 @@ import { getContractApi, updateContractApi } from '@/api/contract'
196 import { getDicByCodes } from '@/utils/dic' 218 import { getDicByCodes } from '@/utils/dic'
197 import { formatCurrencyToChinese } from '@/utils/common' 219 import { formatCurrencyToChinese } from '@/utils/common'
198 import { workshopQueryApi } from '@/api/devManage' 220 import { workshopQueryApi } from '@/api/devManage'
  221 +import { getArea } from '@/api/credit_manage.js'
199 export default { 222 export default {
200 name: 'ModifyContractForeignStd', 223 name: 'ModifyContractForeignStd',
201 components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector }, 224 components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector },
@@ -209,8 +232,14 @@ export default { @@ -209,8 +232,14 @@ export default {
209 supplierName: '', 232 supplierName: '',
210 buyer: '', 233 buyer: '',
211 buyerName: '', 234 buyerName: '',
  235 + stockUpCompanyId: '',
  236 + stockUpCompanyName: '',
212 workshopId: '', 237 workshopId: '',
213 workshopName: '', 238 workshopName: '',
  239 + region: '',
  240 + regionName: '',
  241 + deptName: '',
  242 + deptId: '',
214 orderDate: '', 243 orderDate: '',
215 deliveryDate: '', 244 deliveryDate: '',
216 designatedConsignee: '', 245 designatedConsignee: '',
@@ -251,7 +280,8 @@ export default { @@ -251,7 +280,8 @@ export default {
251 totalAmountIncludingTax: 0, 280 totalAmountIncludingTax: 0,
252 productLineList: [], 281 productLineList: [],
253 newProductLineList: [], 282 newProductLineList: [],
254 - productList: [] 283 + productList: [],
  284 + regionOptions: []
255 } 285 }
256 }, 286 },
257 onLoad(query) { 287 onLoad(query) {
@@ -260,6 +290,7 @@ export default { @@ -260,6 +290,7 @@ export default {
260 created() { 290 created() {
261 this.loadSuppliers() 291 this.loadSuppliers()
262 this.loadExtraOptions() 292 this.loadExtraOptions()
  293 + this.loadRegionOptions()
263 this.loadDetail() 294 this.loadDetail()
264 this.$nextTick(() => { 295 this.$nextTick(() => {
265 if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) { 296 if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
@@ -268,6 +299,15 @@ export default { @@ -268,6 +299,15 @@ export default {
268 }) 299 })
269 }, 300 },
270 methods: { 301 methods: {
  302 + async loadRegionOptions() {
  303 + try {
  304 + const res = await getArea()
  305 + const list = res.data || []
  306 + this.regionOptions = (list || []).map(it => ({ label: it.name || '', value: it.id || '' }))
  307 + } catch (e) {
  308 + this.regionOptions = []
  309 + }
  310 + },
271 async loadDetail() { 311 async loadDetail() {
272 if (!this.id) return 312 if (!this.id) return
273 try { 313 try {
@@ -284,6 +324,8 @@ export default { @@ -284,6 +324,8 @@ export default {
284 supplierName: m.supplierName || '', 324 supplierName: m.supplierName || '',
285 buyer: m.buyer || (m.customer && m.customer.id) || '', 325 buyer: m.buyer || (m.customer && m.customer.id) || '',
286 buyerName: m.buyerName || (m.customer && m.customer.name) || '', 326 buyerName: m.buyerName || (m.customer && m.customer.name) || '',
  327 + stockUpCompanyId: m.stockUpCompanyId || '',
  328 + stockUpCompanyName: m.stockUpCompanyName || '',
287 orderDate: m.orderDate || '', 329 orderDate: m.orderDate || '',
288 designatedConsignee: m.designatedConsignee || '', 330 designatedConsignee: m.designatedConsignee || '',
289 specialTerms: m.specialTerms || '', 331 specialTerms: m.specialTerms || '',
@@ -313,6 +355,10 @@ export default { @@ -313,6 +355,10 @@ export default {
313 packaging: m.packaging || '', 355 packaging: m.packaging || '',
314 workshopId: m.workshopId || '', 356 workshopId: m.workshopId || '',
315 workshopName: m.workshopName || '', 357 workshopName: m.workshopName || '',
  358 + region: m.region || '',
  359 + regionName: m.regionName || '',
  360 + deptName: m.deptName || '',
  361 + deptId: m.deptId || '',
316 } 362 }
317 const lines = Array.isArray(m.contractDistributorLineList) ? m.contractDistributorLineList : [] 363 const lines = Array.isArray(m.contractDistributorLineList) ? m.contractDistributorLineList : []
318 this.productLineList = lines 364 this.productLineList = lines
@@ -368,7 +414,7 @@ export default { @@ -368,7 +414,7 @@ export default {
368 }, 414 },
369 displayLabel(field) { 415 displayLabel(field) {
370 const m = this.form 416 const m = this.form
371 - const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopName: '请选择生产厂' } 417 + const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopName: '请选择生产厂', regionName: '请选择区域' }
372 const val = m[field] 418 const val = m[field]
373 return val ? String(val) : map[field] 419 return val ? String(val) : map[field]
374 }, 420 },
@@ -397,6 +443,8 @@ export default { @@ -397,6 +443,8 @@ export default {
397 setSheet('单价中是否已包含包装费', this.yesNoList) 443 setSheet('单价中是否已包含包装费', this.yesNoList)
398 } else if (field === 'includesTransportFee') { 444 } else if (field === 'includesTransportFee') {
399 setSheet('单价中是否已包含运费', this.yesNoList) 445 setSheet('单价中是否已包含运费', this.yesNoList)
  446 + } else if (field === 'region') {
  447 + setSheet('区域', this.regionOptions)
400 } 448 }
401 }, 449 },
402 onSheetConfirm({ value, label }) { 450 onSheetConfirm({ value, label }) {
@@ -410,6 +458,8 @@ export default { @@ -410,6 +458,8 @@ export default {
410 let config = {} 458 let config = {}
411 if (fieldKey === 'buyer') { 459 if (fieldKey === 'buyer') {
412 config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] } 460 config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
  461 + } else if (fieldKey === 'stockUpCompanyId') {
  462 + config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
413 } 463 }
414 const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : [] 464 const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
415 this.sheet.visible = false 465 this.sheet.visible = false
@@ -420,7 +470,12 @@ export default { @@ -420,7 +470,12 @@ export default {
420 const _fieldKey = this.relate.fieldKey 470 const _fieldKey = this.relate.fieldKey
421 const first = (items && items.length > 0) ? items[0] : null 471 const first = (items && items.length > 0) ? items[0] : null
422 this.form[_fieldKey] = (first && first.id) ? first.id : '' 472 this.form[_fieldKey] = (first && first.id) ? first.id : ''
423 - this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : '' 473 +
  474 + if (_fieldKey === 'stockUpCompanyId') {
  475 + this.form.stockUpCompanyName = (first && first.name) ? first.name : ''
  476 + } else {
  477 + this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : ''
  478 + }
424 }, 479 },
425 onRadioSelect(field, nameField, opt) { 480 onRadioSelect(field, nameField, opt) {
426 const val = opt && opt.value != null ? opt.value : '' 481 const val = opt && opt.value != null ? opt.value : ''
@@ -436,9 +491,11 @@ export default { @@ -436,9 +491,11 @@ export default {
436 { key: 'code', label: '编号' }, 491 { key: 'code', label: '编号' },
437 { key: 'supplier', label: '供方' }, 492 { key: 'supplier', label: '供方' },
438 { key: 'buyer', label: '需方' }, 493 { key: 'buyer', label: '需方' },
  494 + { key: 'stockUpCompanyId', label: '备货单位/人（生产标准）' },
439 { key: 'orderDate', label: '订货日期' }, 495 { key: 'orderDate', label: '订货日期' },
440 { key: 'unit', label: '单位' }, 496 { key: 'unit', label: '单位' },
441 { key: 'workshopId', label: '生产厂' }, 497 { key: 'workshopId', label: '生产厂' },
  498 + { key: 'region', label: '区域' },
442 { key: 'specialTerms', label: '特别条款要求' }, 499 { key: 'specialTerms', label: '特别条款要求' },
443 ] 500 ]
444 for (const it of checks) { 501 for (const it of checks) {
@@ -466,6 +523,7 @@ export default { @@ -466,6 +523,7 @@ export default {
466 uni.showToast({ title: `第${idx + 1}条明细未完整填写`, icon: 'none' }); return false 523 uni.showToast({ title: `第${idx + 1}条明细未完整填写`, icon: 'none' }); return false
467 } 524 }
468 } 525 }
  526 + if (this.$refs.productRel && !this.$refs.productRel.validate()) return false
469 return true 527 return true
470 }, 528 },
471 async onSubmit() { 529 async onSubmit() {
@@ -60,14 +60,14 @@ @@ -60,14 +60,14 @@
60 </uni-list-item> 60 </uni-list-item>
61 <uni-list-item title="厚度公差上限(mm)"> 61 <uni-list-item title="厚度公差上限(mm)">
62 <template v-slot:footer> 62 <template v-slot:footer>
63 - <uni-easyinput type="digit" v-model="item.thicknessTolPos" :inputBorder="false"  
64 - placeholder="请输入厚度公差上限" @input="onNonNegativeInput(idx, 'thicknessTolPos')" @blur="onNonNegativeBlur(idx, 'thicknessTolPos', 2)" /> 63 + <uni-easyinput type="text" v-model="item.thicknessTolPos" :inputBorder="false"
  64 + placeholder="请输入厚度公差上限" @input="onNumberInput(idx, 'thicknessTolPos')" @blur="onNumberBlur(idx, 'thicknessTolPos', 2)" />
65 </template> 65 </template>
66 </uni-list-item> 66 </uni-list-item>
67 <uni-list-item title="厚度公差下限(mm)"> 67 <uni-list-item title="厚度公差下限(mm)">
68 <template v-slot:footer> 68 <template v-slot:footer>
69 - <uni-easyinput type="digit" v-model="item.thicknessTolNeg" :inputBorder="false"  
70 - placeholder="请输入厚度公差下限" @input="onNonNegativeInput(idx, 'thicknessTolNeg')" @blur="onNonNegativeBlur(idx, 'thicknessTolNeg', 2)" /> 69 + <uni-easyinput type="text" v-model="item.thicknessTolNeg" :inputBorder="false"
  70 + placeholder="请输入厚度公差下限" @input="onNumberInput(idx, 'thicknessTolNeg')" @blur="onNumberBlur(idx, 'thicknessTolNeg', 2)" />
71 </template> 71 </template>
72 </uni-list-item> 72 </uni-list-item>
73 <uni-list-item title="宽度(mm)"> 73 <uni-list-item title="宽度(mm)">
@@ -77,12 +77,12 @@ @@ -77,12 +77,12 @@
77 </uni-list-item> 77 </uni-list-item>
78 <uni-list-item title="宽度公差上限(mm)"> 78 <uni-list-item title="宽度公差上限(mm)">
79 <template v-slot:footer> 79 <template v-slot:footer>
80 - <uni-easyinput type="digit" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差上限" @input="onNonNegativeInput(idx, 'widthTolPos')" @blur="onNonNegativeBlur(idx, 'widthTolPos', 2)" /> 80 + <uni-easyinput type="text" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差上限" @input="onNumberInput(idx, 'widthTolPos')" @blur="onNumberBlur(idx, 'widthTolPos', 2)" />
81 </template> 81 </template>
82 </uni-list-item> 82 </uni-list-item>
83 <uni-list-item title="宽度公差下限(mm)"> 83 <uni-list-item title="宽度公差下限(mm)">
84 <template v-slot:footer> 84 <template v-slot:footer>
85 - <uni-easyinput type="digit" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差下限" @input="onNonNegativeInput(idx, 'widthTolNeg')" @blur="onNonNegativeBlur(idx, 'widthTolNeg', 2)" /> 85 + <uni-easyinput type="text" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差下限" @input="onNumberInput(idx, 'widthTolNeg')" @blur="onNumberBlur(idx, 'widthTolNeg', 2)" />
86 </template> 86 </template>
87 </uni-list-item> 87 </uni-list-item>
88 <uni-list-item title="长度(mm)"> 88 <uni-list-item title="长度(mm)">
@@ -92,14 +92,14 @@ @@ -92,14 +92,14 @@
92 </uni-list-item> 92 </uni-list-item>
93 <uni-list-item title="长度公差上限(mm)"> 93 <uni-list-item title="长度公差上限(mm)">
94 <template v-slot:footer> 94 <template v-slot:footer>
95 - <uni-easyinput type="digit" v-model="item.lengthTolPos" :inputBorder="false"  
96 - placeholder="请输入长度公差上限" @input="onNonNegativeInput(idx, 'lengthTolPos')" @blur="onNonNegativeBlur(idx, 'lengthTolPos', 2)" /> 95 + <uni-easyinput type="text" v-model="item.lengthTolPos" :inputBorder="false"
  96 + placeholder="请输入长度公差上限" @input="onNumberInput(idx, 'lengthTolPos')" @blur="onNumberBlur(idx, 'lengthTolPos', 2)" />
97 </template> 97 </template>
98 </uni-list-item> 98 </uni-list-item>
99 <uni-list-item title="长度公差下限(mm)"> 99 <uni-list-item title="长度公差下限(mm)">
100 <template v-slot:footer> 100 <template v-slot:footer>
101 - <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false"  
102 - placeholder="请输入长度公差下限" @input="onNonNegativeInput(idx, 'lengthTolNeg')" @blur="onNonNegativeBlur(idx, 'lengthTolNeg', 2)" /> 101 + <uni-easyinput type="text" v-model="item.lengthTolNeg" :inputBorder="false"
  102 + placeholder="请输入长度公差下限" @input="onNumberInput(idx, 'lengthTolNeg')" @blur="onNumberBlur(idx, 'lengthTolNeg', 2)" />
103 </template> 103 </template>
104 </uni-list-item> 104 </uni-list-item>
105 <uni-list-item title="状态"> 105 <uni-list-item title="状态">
@@ -302,6 +302,62 @@ export default { @@ -302,6 +302,62 @@ export default {
302 this.$set(this.items, idx, it) 302 this.$set(this.items, idx, it)
303 if (field === 'quantity' || field === 'unitPrice') this.recalculate(idx) 303 if (field === 'quantity' || field === 'unitPrice') this.recalculate(idx)
304 }, 304 },
  305 + onNumberInput(idx, field) {
  306 + const it = this.items[idx]
  307 + if (!it) return
  308 + let v = String(it[field] != null ? it[field] : '')
  309 + v = v.replace(/[^0-9.-]/g, '')
  310 + if (v.lastIndexOf('-') > 0) {
  311 + const hasMinusAtStart = v.startsWith('-')
  312 + v = v.replace(/-/g, '')
  313 + if (hasMinusAtStart) v = '-' + v
  314 + }
  315 + if ((v.match(/\./g) || []).length > 1) {
  316 + const firstDotIndex = v.indexOf('.')
  317 + v = v.substring(0, firstDotIndex + 1) + v.substring(firstDotIndex + 1).replace(/\./g, '')
  318 + }
  319 + if (v.startsWith('.')) v = '0' + v
  320 + if (v.startsWith('-.')) v = '-0' + v.substring(1)
  321 + it[field] = v
  322 + this.$set(this.items, idx, it)
  323 + },
  324 + onNumberBlur(idx, field, digits) {
  325 + const it = this.items[idx]
  326 + if (!it) return
  327 + const raw = it[field]
  328 + if (raw === '' || raw === null || raw === undefined || raw === '-') {
  329 + this.$set(this.items, idx, it)
  330 + return
  331 + }
  332 + let num = this.toNumber(raw)
  333 + if (isNaN(num)) num = 0
  334 + const rounded = this.round(num, digits)
  335 + it[field] = rounded
  336 + this.$set(this.items, idx, it)
  337 + },
  338 + validate() {
  339 + for (let i = 0; i < this.items.length; i++) {
  340 + const it = this.items[i]
  341 + const check = (pos, neg, label) => {
  342 + if (pos !== '' && pos !== null && pos !== undefined &&
  343 + neg !== '' && neg !== null && neg !== undefined) {
  344 + if (Number(pos) <= Number(neg)) {
  345 + return `第${i + 1}行产品：${label}公差上限必须大于下限`
  346 + }
  347 + }
  348 + return null
  349 + }
  350 + let err = check(it.thicknessTolPos, it.thicknessTolNeg, '厚度')
  351 + if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
  352 +
  353 + err = check(it.widthTolPos, it.widthTolNeg, '宽度')
  354 + if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
  355 +
  356 + err = check(it.lengthTolPos, it.lengthTolNeg, '长度')
  357 + if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
  358 + }
  359 + return true
  360 + },
305 formatCurrency(val) { 361 formatCurrency(val) {
306 if (val == null || val === '') return '' 362 if (val == null || val === '') return ''
307 const num = Number(val) 363 const num = Number(val)
@@ -22,6 +22,13 @@ @@ -22,6 +22,13 @@
22 </template> 22 </template>
23 </uni-list-item> 23 </uni-list-item>
24 24
  25 + <uni-list-item class="select-item" :class="form.stockUpCompanyId ? 'is-filled' : 'is-empty'" clickable
  26 + @click="openRelate('stockUpCompanyId')" :rightText="form.stockUpCompanyName || '请选择备货单位'" showArrow>
  27 + <template v-slot:body>
  28 + <view class="item-title"><text class="required">*</text><text>备货单位/人（生产标准）</text></view>
  29 + </template>
  30 + </uni-list-item>
  31 +
25 <uni-list-item title="订货日期"> 32 <uni-list-item title="订货日期">
26 <template v-slot:footer> 33 <template v-slot:footer>
27 <uni-datetime-picker type="date" v-model="form.orderDate" /> 34 <uni-datetime-picker type="date" v-model="form.orderDate" />
@@ -39,7 +46,24 @@ @@ -39,7 +46,24 @@
39 <view class="item-title"><text class="required">*</text><text>生产厂</text></view> 46 <view class="item-title"><text class="required">*</text><text>生产厂</text></view>
40 </template> 47 </template>
41 </uni-list-item> 48 </uni-list-item>
42 - <ProductRel mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" @change="onProductsChange" :options="productList" /> 49 + <uni-list-item class="select-item" :class="form.deptName ? 'is-filled' : 'is-empty'">
  50 + <template v-slot:body>
  51 + <view class="item-title"><text class="required">*</text><text>办事处</text></view>
  52 + </template>
  53 + <template v-slot:footer>
  54 + <view class="serial-number-row">
  55 + <uni-easyinput v-model="form.deptName" :inputBorder="false" disabled />
  56 + </view>
  57 + </template>
  58 + </uni-list-item>
  59 + <uni-list-item class="select-item" :class="form.region ? 'is-filled' : 'is-empty'" clickable
  60 + @click="openSheet('region')" :rightText="displayLabel('regionName')" showArrow>
  61 + <template v-slot:body>
  62 + <view class="item-title"><text class="required">*</text><text>区域</text></view>
  63 + </template>
  64 + </uni-list-item>
  65 + <ProductRel ref="productRel" mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate"
  66 + @change="onProductsChange" :options="productList" />
43 <uni-list-item title="合计人民币金额（大写）"> 67 <uni-list-item title="合计人民币金额（大写）">
44 <template v-slot:footer> 68 <template v-slot:footer>
45 <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false" disabled /> 69 <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false" disabled />
@@ -208,10 +232,11 @@ import SingleSelectSheet from '@/components/single-select/index.vue' @@ -208,10 +232,11 @@ import SingleSelectSheet from '@/components/single-select/index.vue'
208 import RelateSelectSheet from '@/components/relate-select/index.vue' 232 import RelateSelectSheet from '@/components/relate-select/index.vue'
209 import ProductRel from './productRel.vue' 233 import ProductRel from './productRel.vue'
210 import CitySelector from '@/components/city-selector/index.vue' 234 import CitySelector from '@/components/city-selector/index.vue'
211 -import { getRetailCodeApi, createContractApi, getCustomerSpecificQualityRequirements,getCustomerRemarks } from '@/api/contract' 235 +import { getRetailCodeApi, createContractApi, getCustomerSpecificQualityRequirements,getCustomerRemarks, getDeptApi } from '@/api/contract'
212 import { getDicByCodes } from '@/utils/dic' 236 import { getDicByCodes } from '@/utils/dic'
213 import { formatCurrencyToChinese } from '@/utils/common' 237 import { formatCurrencyToChinese } from '@/utils/common'
214 import { workshopQueryApi } from '@/api/devManage' 238 import { workshopQueryApi } from '@/api/devManage'
  239 +import { getArea } from '@/api/credit_manage.js'
215 240
216 export default { 241 export default {
217 name: 'AddContractForeignStock', 242 name: 'AddContractForeignStock',
@@ -224,6 +249,8 @@ export default { @@ -224,6 +249,8 @@ export default {
224 supplierName: '', 249 supplierName: '',
225 buyer: '', 250 buyer: '',
226 buyerName: '', 251 buyerName: '',
  252 + stockUpCompanyId: '',
  253 + stockUpCompanyName: '',
227 orderDate: '', 254 orderDate: '',
228 deliveryDate: '', 255 deliveryDate: '',
229 designatedConsignee: '', 256 designatedConsignee: '',
@@ -242,7 +269,11 @@ export default { @@ -242,7 +269,11 @@ export default {
242 destinationLabel: '', 269 destinationLabel: '',
243 workshopIdName: '', 270 workshopIdName: '',
244 workshopId: '', 271 workshopId: '',
245 - component: '', 272 + deptName: '',
  273 + deptId: '',
  274 + region: '',
  275 + regionName: '',
  276 + remarks: '',
246 packaging: '', 277 packaging: '',
247 performance: '', 278 performance: '',
248 pieceWeightHead: '', 279 pieceWeightHead: '',
@@ -263,12 +294,15 @@ export default { @@ -263,12 +294,15 @@ export default {
263 productList: [], 294 productList: [],
264 customerRemarks: [], 295 customerRemarks: [],
265 defaultRemark: '', 296 defaultRemark: '',
  297 + regionOptions: [],
266 } 298 }
267 }, 299 },
268 created() { 300 created() {
269 this.loadSuppliers() 301 this.loadSuppliers()
270 this.loadExtraOptions() 302 this.loadExtraOptions()
271 this.initCode() 303 this.initCode()
  304 + this.getDept()
  305 + this.loadRegionOptions()
272 this.form.orderDate = this.formatDate(new Date()) 306 this.form.orderDate = this.formatDate(new Date())
273 this.$nextTick(() => { 307 this.$nextTick(() => {
274 if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) { 308 if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
@@ -318,6 +352,24 @@ export default { @@ -318,6 +352,24 @@ export default {
318 }, 352 },
319 }, 353 },
320 methods: { 354 methods: {
  355 + async loadRegionOptions() {
  356 + try {
  357 + const res = await getArea()
  358 + const list = res.data || []
  359 + this.regionOptions = (list || []).map(it => ({ label: it.name || '', value: it.id || '' }))
  360 + } catch (e) {
  361 + this.regionOptions = []
  362 + }
  363 + },
  364 + // 查询当前人所在办事处
  365 + getDept() {
  366 + getDeptApi().then(res => {
  367 + if (res.code === 200) {
  368 + this.form.deptName = res.data.name || ''
  369 + this.form.deptId = res.data.id || ''
  370 + }
  371 + })
  372 + },
321 getHistory() { 373 getHistory() {
322 console.log('this.productLineList', this.productLineList[0].productId) 374 console.log('this.productLineList', this.productLineList[0].productId)
323 if (!this.productLineList.length || !this.productLineList[0].productId) { 375 if (!this.productLineList.length || !this.productLineList[0].productId) {
@@ -405,7 +457,7 @@ export default { @@ -405,7 +457,7 @@ export default {
405 }, 457 },
406 displayLabel(field) { 458 displayLabel(field) {
407 const m = this.form 459 const m = this.form
408 - const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopIdName: '请选择生产厂' } 460 + const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopIdName: '请选择生产厂', regionName: '请选择区域' }
409 const val = m[field] 461 const val = m[field]
410 return val ? String(val) : map[field] 462 return val ? String(val) : map[field]
411 }, 463 },
@@ -450,6 +502,8 @@ export default { @@ -450,6 +502,8 @@ export default {
450 setSheet('单价中是否已包含运费', this.yesNoList) 502 setSheet('单价中是否已包含运费', this.yesNoList)
451 } else if (field === 'historyRemarks') { 503 } else if (field === 'historyRemarks') {
452 setSheet('历史备注', this.customerRemarks) 504 setSheet('历史备注', this.customerRemarks)
  505 + }else if (field === 'region') {
  506 + setSheet('区域', this.regionOptions)
453 } 507 }
454 }, 508 },
455 onSheetConfirm({ value, label }) { 509 onSheetConfirm({ value, label }) {
@@ -468,6 +522,8 @@ export default { @@ -468,6 +522,8 @@ export default {
468 let config = {} 522 let config = {}
469 if (fieldKey === 'buyer') { 523 if (fieldKey === 'buyer') {
470 config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] } 524 config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
  525 + } else if (fieldKey === 'stockUpCompanyId') {
  526 + config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
471 } 527 }
472 const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : [] 528 const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
473 this.sheet.visible = false 529 this.sheet.visible = false
@@ -478,7 +534,17 @@ export default { @@ -478,7 +534,17 @@ export default {
478 const _fieldKey = this.relate.fieldKey 534 const _fieldKey = this.relate.fieldKey
479 const first = (items && items.length > 0) ? items[0] : null 535 const first = (items && items.length > 0) ? items[0] : null
480 this.form[_fieldKey] = (first && first.id) ? first.id : '' 536 this.form[_fieldKey] = (first && first.id) ? first.id : ''
481 - this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : '' 537 +
  538 + if (_fieldKey === 'stockUpCompanyId') {
  539 + this.form.stockUpCompanyName = (first && first.name) ? first.name : ''
  540 + } else {
  541 + this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : ''
  542 + }
  543 +
  544 + if (_fieldKey === 'buyer') {
  545 + this.form.stockUpCompanyId = (first && first.id) ? first.id : ''
  546 + this.form.stockUpCompanyName = (first && first.name) ? first.name : ''
  547 + }
482 }, 548 },
483 onRadioSelect(field, nameField, opt) { 549 onRadioSelect(field, nameField, opt) {
484 const val = opt && opt.value != null ? opt.value : '' 550 const val = opt && opt.value != null ? opt.value : ''
@@ -534,9 +600,11 @@ export default { @@ -534,9 +600,11 @@ export default {
534 { key: 'code', label: '编号' }, 600 { key: 'code', label: '编号' },
535 { key: 'supplier', label: '供方' }, 601 { key: 'supplier', label: '供方' },
536 { key: 'buyer', label: '需方' }, 602 { key: 'buyer', label: '需方' },
  603 + { key: 'stockUpCompanyId', label: '备货单位/人（生产标准）' },
537 { key: 'orderDate', label: '订货日期' }, 604 { key: 'orderDate', label: '订货日期' },
538 { key: 'unit', label: '单位' }, 605 { key: 'unit', label: '单位' },
539 { key: 'workshopId', label: '生产厂' }, 606 { key: 'workshopId', label: '生产厂' },
  607 + { key: 'region', label: '区域' },
540 { key: 'specialTerms', label: '特别条款要求' }, 608 { key: 'specialTerms', label: '特别条款要求' },
541 ] 609 ]
542 for (const it of checks) { 610 for (const it of checks) {
@@ -544,6 +612,7 @@ export default { @@ -544,6 +612,7 @@ export default {
544 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val))) 612 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
545 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false } 613 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
546 } 614 }
  615 + if (this.$refs.productRel && !this.$refs.productRel.validate()) return false
547 const list = Array.isArray(this.productLineList) ? this.productLineList : [] 616 const list = Array.isArray(this.productLineList) ? this.productLineList : []
548 if (list.length === 0) { 617 if (list.length === 0) {
549 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false 618 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false
@@ -9,11 +9,17 @@ @@ -9,11 +9,17 @@
9 }}</text></view> 9 }}</text></view>
10 <view class="row"><text class="label">需方</text><text class="value">{{ detail.buyerName || '-' 10 <view class="row"><text class="label">需方</text><text class="value">{{ detail.buyerName || '-'
11 }}</text></view> 11 }}</text></view>
  12 + <view class="row"><text class="label">备货单位/人（生产标准）</text><text class="value">{{ detail.stockUpCompanyName || '-'
  13 + }}</text></view>
12 <view class="row"><text class="label">订货日期</text><text class="value">{{ detail.orderDate }}</text> 14 <view class="row"><text class="label">订货日期</text><text class="value">{{ detail.orderDate }}</text>
13 </view> 15 </view>
14 <view class="row"><text class="label">单位</text><text class="value">{{ detail.unit }}</text></view> 16 <view class="row"><text class="label">单位</text><text class="value">{{ detail.unit }}</text></view>
15 <view class="row"><text class="label">生产厂</text><text class="value">{{ detail.workshopName || '-' 17 <view class="row"><text class="label">生产厂</text><text class="value">{{ detail.workshopName || '-'
16 }}</text></view> 18 }}</text></view>
  19 + <view class="row"><text class="label">办事处</text><text class="value">{{ detail.deptName || '-'
  20 + }}</text></view>
  21 + <view class="row"><text class="label">区域</text><text class="value">{{ detail.regionName || '-'
  22 + }}</text></view>
17 </view> 23 </view>
18 24
19 <view class="section1"> 25 <view class="section1">
@@ -139,10 +145,15 @@ export default { @@ -139,10 +145,15 @@ export default {
139 supplierName: '', 145 supplierName: '',
140 buyer: '', 146 buyer: '',
141 buyerName: '', 147 buyerName: '',
  148 + stockUpCompanyId: '',
  149 + stockUpCompanyName: '',
142 orderDate: '', 150 orderDate: '',
143 unit: '', 151 unit: '',
144 workshopId: '', 152 workshopId: '',
145 workshopName: '', 153 workshopName: '',
  154 + deptName: '',
  155 + region: '',
  156 + regionName: '',
146 designatedConsignee: '', 157 designatedConsignee: '',
147 specialTerms: '', 158 specialTerms: '',
148 specialTermsName: '', 159 specialTermsName: '',
@@ -451,6 +462,9 @@ export default { @@ -451,6 +462,9 @@ export default {
451 this.detail = { 462 this.detail = {
452 ...this.detail, 463 ...this.detail,
453 ...data, 464 ...data,
  465 + stockUpCompanyName: data.stockUpCompanyName || '',
  466 + regionName: data.regionName || '',
  467 + deptName: data.deptName || '',
454 includesPackagingFeeName, includesTransportFeeName, 468 includesPackagingFeeName, includesTransportFeeName,
455 destinationId: data.provinceId && data.cityId && data.districtId ? [data.provinceId, data.cityId, data.districtId] : '', 469 destinationId: data.provinceId && data.cityId && data.districtId ? [data.provinceId, data.cityId, data.districtId] : '',
456 destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '', 470 destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '',
@@ -22,12 +22,35 @@ @@ -22,12 +22,35 @@
22 </template> 22 </template>
23 </uni-list-item> 23 </uni-list-item>
24 24
  25 + <uni-list-item class="select-item" :class="form.stockUpCompanyId ? 'is-filled' : 'is-empty'" clickable
  26 + @click="openRelate('stockUpCompanyId')" :rightText="form.stockUpCompanyName || '请选择备货单位'" showArrow>
  27 + <template v-slot:body>
  28 + <view class="item-title"><text class="required">*</text><text>备货单位/人（生产标准）</text></view>
  29 + </template>
  30 + </uni-list-item>
  31 +
25 <uni-list-item class="select-item" :class="form.workshopId ? 'is-filled' : 'is-empty'" clickable 32 <uni-list-item class="select-item" :class="form.workshopId ? 'is-filled' : 'is-empty'" clickable
26 @click="openSheet('workshopId')" :rightText="form.workshopName || '请选择生产厂'" showArrow> 33 @click="openSheet('workshopId')" :rightText="form.workshopName || '请选择生产厂'" showArrow>
27 <template v-slot:body> 34 <template v-slot:body>
28 <view class="item-title"><text class="required">*</text><text>生产厂</text></view> 35 <view class="item-title"><text class="required">*</text><text>生产厂</text></view>
29 </template> 36 </template>
30 </uni-list-item> 37 </uni-list-item>
  38 + <uni-list-item class="select-item" :class="form.deptName ? 'is-filled' : 'is-empty'">
  39 + <template v-slot:body>
  40 + <view class="item-title"><text class="required">*</text><text>办事处</text></view>
  41 + </template>
  42 + <template v-slot:footer>
  43 + <view class="serial-number-row">
  44 + <uni-easyinput v-model="form.deptName" :inputBorder="false" disabled />
  45 + </view>
  46 + </template>
  47 + </uni-list-item>
  48 + <uni-list-item class="select-item" :class="form.region ? 'is-filled' : 'is-empty'" clickable
  49 + @click="openSheet('region')" :rightText="displayLabel('regionName')" showArrow>
  50 + <template v-slot:body>
  51 + <view class="item-title"><text class="required">*</text><text>区域</text></view>
  52 + </template>
  53 + </uni-list-item>
31 54
32 <uni-list-item title="订货日期"> 55 <uni-list-item title="订货日期">
33 <template v-slot:footer> 56 <template v-slot:footer>
@@ -41,7 +64,8 @@ @@ -41,7 +64,8 @@
41 </template> 64 </template>
42 </uni-list-item> 65 </uni-list-item>
43 66
44 - <ProductRel mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" :list="productLineList" @change="onProductsChange" :options="productList" /> 67 + <ProductRel ref="productRel" mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate"
  68 + :list="productLineList" @change="onProductsChange" :options="productList" />
45 69
46 <uni-list-item title="合计人民币金额（大写）"> 70 <uni-list-item title="合计人民币金额（大写）">
47 <template v-slot:footer> 71 <template v-slot:footer>
@@ -198,6 +222,8 @@ import { getContractApi, updateContractApi } from '@/api/contract' @@ -198,6 +222,8 @@ import { getContractApi, updateContractApi } from '@/api/contract'
198 import { getDicByCodes } from '@/utils/dic' 222 import { getDicByCodes } from '@/utils/dic'
199 import { formatCurrencyToChinese } from '@/utils/common' 223 import { formatCurrencyToChinese } from '@/utils/common'
200 import { workshopQueryApi } from '@/api/devManage' 224 import { workshopQueryApi } from '@/api/devManage'
  225 +import { getArea } from '@/api/credit_manage.js'
  226 +
201 export default { 227 export default {
202 name: 'ModifyContractForeignStock', 228 name: 'ModifyContractForeignStock',
203 components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector }, 229 components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector },
@@ -211,8 +237,14 @@ export default { @@ -211,8 +237,14 @@ export default {
211 supplierName: '', 237 supplierName: '',
212 buyer: '', 238 buyer: '',
213 buyerName: '', 239 buyerName: '',
  240 + stockUpCompanyId: '',
  241 + stockUpCompanyName: '',
214 workshopId: '', 242 workshopId: '',
215 workshopName: '', 243 workshopName: '',
  244 + region: '',
  245 + regionName: '',
  246 + deptName: '',
  247 + deptId: '',
216 orderDate: '', 248 orderDate: '',
217 deliveryDate: '', 249 deliveryDate: '',
218 designatedConsignee: '', 250 designatedConsignee: '',
@@ -253,7 +285,8 @@ export default { @@ -253,7 +285,8 @@ export default {
253 totalAmountIncludingTax: 0, 285 totalAmountIncludingTax: 0,
254 productLineList: [], 286 productLineList: [],
255 newProductLineList: [], 287 newProductLineList: [],
256 - productList: [] 288 + productList: [],
  289 + regionOptions: []
257 } 290 }
258 }, 291 },
259 onLoad(query) { 292 onLoad(query) {
@@ -262,6 +295,7 @@ export default { @@ -262,6 +295,7 @@ export default {
262 created() { 295 created() {
263 this.loadSuppliers() 296 this.loadSuppliers()
264 this.loadExtraOptions() 297 this.loadExtraOptions()
  298 + this.loadRegionOptions()
265 this.loadDetail() 299 this.loadDetail()
266 this.$nextTick(() => { 300 this.$nextTick(() => {
267 if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) { 301 if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
@@ -270,6 +304,15 @@ export default { @@ -270,6 +304,15 @@ export default {
270 }) 304 })
271 }, 305 },
272 methods: { 306 methods: {
  307 + async loadRegionOptions() {
  308 + try {
  309 + const res = await getArea()
  310 + const list = res.data || []
  311 + this.regionOptions = (list || []).map(it => ({ label: it.name || '', value: it.id || '' }))
  312 + } catch (e) {
  313 + this.regionOptions = []
  314 + }
  315 + },
273 async loadDetail() { 316 async loadDetail() {
274 if (!this.id) return 317 if (!this.id) return
275 try { 318 try {
@@ -286,6 +329,8 @@ export default { @@ -286,6 +329,8 @@ export default {
286 supplierName: m.supplierName || '', 329 supplierName: m.supplierName || '',
287 buyer: m.buyer || (m.customer && m.customer.id) || '', 330 buyer: m.buyer || (m.customer && m.customer.id) || '',
288 buyerName: m.buyerName || (m.customer && m.customer.name) || '', 331 buyerName: m.buyerName || (m.customer && m.customer.name) || '',
  332 + stockUpCompanyId: m.stockUpCompanyId || '',
  333 + stockUpCompanyName: m.stockUpCompanyName || '',
289 orderDate: m.orderDate || '', 334 orderDate: m.orderDate || '',
290 designatedConsignee: m.designatedConsignee || '', 335 designatedConsignee: m.designatedConsignee || '',
291 specialTerms: m.specialTerms || '', 336 specialTerms: m.specialTerms || '',
@@ -315,6 +360,10 @@ export default { @@ -315,6 +360,10 @@ export default {
315 packaging: m.packaging || '', 360 packaging: m.packaging || '',
316 workshopId: m.workshopId || '', 361 workshopId: m.workshopId || '',
317 workshopName: m.workshopName || '', 362 workshopName: m.workshopName || '',
  363 + region: m.region || '',
  364 + regionName: m.regionName || '',
  365 + deptName: m.deptName || '',
  366 + deptId: m.deptId || '',
318 } 367 }
319 const lines = Array.isArray(m.contractDistributorLineList) ? m.contractDistributorLineList : [] 368 const lines = Array.isArray(m.contractDistributorLineList) ? m.contractDistributorLineList : []
320 this.productLineList = lines 369 this.productLineList = lines
@@ -370,7 +419,7 @@ export default { @@ -370,7 +419,7 @@ export default {
370 }, 419 },
371 displayLabel(field) { 420 displayLabel(field) {
372 const m = this.form 421 const m = this.form
373 - const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopName: '请选择生产厂' } 422 + const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopName: '请选择生产厂', regionName: '请选择区域' }
374 const val = m[field] 423 const val = m[field]
375 return val ? String(val) : map[field] 424 return val ? String(val) : map[field]
376 }, 425 },
@@ -399,6 +448,8 @@ export default { @@ -399,6 +448,8 @@ export default {
399 setSheet('单价中是否已包含包装费', this.yesNoList) 448 setSheet('单价中是否已包含包装费', this.yesNoList)
400 } else if (field === 'includesTransportFee') { 449 } else if (field === 'includesTransportFee') {
401 setSheet('单价中是否已包含运费', this.yesNoList) 450 setSheet('单价中是否已包含运费', this.yesNoList)
  451 + } else if (field === 'region') {
  452 + setSheet('区域', this.regionOptions)
402 } 453 }
403 }, 454 },
404 onSheetConfirm({ value, label }) { 455 onSheetConfirm({ value, label }) {
@@ -412,6 +463,8 @@ export default { @@ -412,6 +463,8 @@ export default {
412 let config = {} 463 let config = {}
413 if (fieldKey === 'buyer') { 464 if (fieldKey === 'buyer') {
414 config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] } 465 config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
  466 + } else if (fieldKey === 'stockUpCompanyId') {
  467 + config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
415 } 468 }
416 const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : [] 469 const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
417 this.sheet.visible = false 470 this.sheet.visible = false
@@ -422,7 +475,12 @@ export default { @@ -422,7 +475,12 @@ export default {
422 const _fieldKey = this.relate.fieldKey 475 const _fieldKey = this.relate.fieldKey
423 const first = (items && items.length > 0) ? items[0] : null 476 const first = (items && items.length > 0) ? items[0] : null
424 this.form[_fieldKey] = (first && first.id) ? first.id : '' 477 this.form[_fieldKey] = (first && first.id) ? first.id : ''
425 - this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : '' 478 +
  479 + if (_fieldKey === 'stockUpCompanyId') {
  480 + this.form.stockUpCompanyName = (first && first.name) ? first.name : ''
  481 + } else {
  482 + this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : ''
  483 + }
426 }, 484 },
427 onRadioSelect(field, nameField, opt) { 485 onRadioSelect(field, nameField, opt) {
428 const val = opt && opt.value != null ? opt.value : '' 486 const val = opt && opt.value != null ? opt.value : ''
@@ -438,9 +496,11 @@ export default { @@ -438,9 +496,11 @@ export default {
438 { key: 'code', label: '编号' }, 496 { key: 'code', label: '编号' },
439 { key: 'supplier', label: '供方' }, 497 { key: 'supplier', label: '供方' },
440 { key: 'buyer', label: '需方' }, 498 { key: 'buyer', label: '需方' },
  499 + { key: 'stockUpCompanyId', label: '备货单位/人（生产标准）' },
441 { key: 'orderDate', label: '订货日期' }, 500 { key: 'orderDate', label: '订货日期' },
442 { key: 'unit', label: '单位' }, 501 { key: 'unit', label: '单位' },
443 { key: 'workshopId', label: '生产厂' }, 502 { key: 'workshopId', label: '生产厂' },
  503 + { key: 'region', label: '区域' },
444 { key: 'specialTerms', label: '特别条款要求' }, 504 { key: 'specialTerms', label: '特别条款要求' },
445 ] 505 ]
446 for (const it of checks) { 506 for (const it of checks) {
@@ -448,6 +508,7 @@ export default { @@ -448,6 +508,7 @@ export default {
448 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val))) 508 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
449 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false } 509 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
450 } 510 }
  511 + if (this.$refs.productRel && !this.$refs.productRel.validate()) return false
451 const list = Array.isArray(this.newProductLineList) ? this.newProductLineList : [] 512 const list = Array.isArray(this.newProductLineList) ? this.newProductLineList : []
452 if (list.length === 0) { 513 if (list.length === 0) {
453 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false 514 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false
@@ -60,14 +60,14 @@ @@ -60,14 +60,14 @@
60 </uni-list-item> 60 </uni-list-item>
61 <uni-list-item title="厚度公差上限(mm)"> 61 <uni-list-item title="厚度公差上限(mm)">
62 <template v-slot:footer> 62 <template v-slot:footer>
63 - <uni-easyinput type="digit" v-model="item.thicknessTolPos" :inputBorder="false"  
64 - placeholder="请输入厚度公差上限" @input="onNonNegativeInput(idx, 'thicknessTolPos')" @blur="onNonNegativeBlur(idx, 'thicknessTolPos', 2)" /> 63 + <uni-easyinput type="text" v-model="item.thicknessTolPos" :inputBorder="false"
  64 + placeholder="请输入厚度公差上限" @input="onNumberInput(idx, 'thicknessTolPos')" @blur="onNumberBlur(idx, 'thicknessTolPos', 2)" />
65 </template> 65 </template>
66 </uni-list-item> 66 </uni-list-item>
67 <uni-list-item title="厚度公差下限(mm)"> 67 <uni-list-item title="厚度公差下限(mm)">
68 <template v-slot:footer> 68 <template v-slot:footer>
69 - <uni-easyinput type="digit" v-model="item.thicknessTolNeg" :inputBorder="false"  
70 - placeholder="请输入厚度公差下限" @input="onNonNegativeInput(idx, 'thicknessTolNeg')" @blur="onNonNegativeBlur(idx, 'thicknessTolNeg', 2)" /> 69 + <uni-easyinput type="text" v-model="item.thicknessTolNeg" :inputBorder="false"
  70 + placeholder="请输入厚度公差下限" @input="onNumberInput(idx, 'thicknessTolNeg')" @blur="onNumberBlur(idx, 'thicknessTolNeg', 2)" />
71 </template> 71 </template>
72 </uni-list-item> 72 </uni-list-item>
73 <uni-list-item title="宽度(mm)"> 73 <uni-list-item title="宽度(mm)">
@@ -77,12 +77,14 @@ @@ -77,12 +77,14 @@
77 </uni-list-item> 77 </uni-list-item>
78 <uni-list-item title="宽度公差上限(mm)"> 78 <uni-list-item title="宽度公差上限(mm)">
79 <template v-slot:footer> 79 <template v-slot:footer>
80 - <uni-easyinput type="digit" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差(单项+)" @input="onNonNegativeInput(idx, 'widthTolPos')" @blur="onNonNegativeBlur(idx, 'widthTolPos', 2)" /> 80 + <uni-easyinput type="text" v-model="item.widthTolPos" :inputBorder="false"
  81 + placeholder="请输入宽度公差上限" @input="onNumberInput(idx, 'widthTolPos')" @blur="onNumberBlur(idx, 'widthTolPos', 2)" />
81 </template> 82 </template>
82 </uni-list-item> 83 </uni-list-item>
83 <uni-list-item title="宽度公差下限(mm)"> 84 <uni-list-item title="宽度公差下限(mm)">
84 <template v-slot:footer> 85 <template v-slot:footer>
85 - <uni-easyinput type="digit" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差下限" @input="onNonNegativeInput(idx, 'widthTolNeg')" @blur="onNonNegativeBlur(idx, 'widthTolNeg', 2)" /> 86 + <uni-easyinput type="text" v-model="item.widthTolNeg" :inputBorder="false"
  87 + placeholder="请输入宽度公差下限" @input="onNumberInput(idx, 'widthTolNeg')" @blur="onNumberBlur(idx, 'widthTolNeg', 2)" />
86 </template> 88 </template>
87 </uni-list-item> 89 </uni-list-item>
88 <uni-list-item title="长度(mm)"> 90 <uni-list-item title="长度(mm)">
@@ -92,14 +94,14 @@ @@ -92,14 +94,14 @@
92 </uni-list-item> 94 </uni-list-item>
93 <uni-list-item title="长度公差上限(mm)"> 95 <uni-list-item title="长度公差上限(mm)">
94 <template v-slot:footer> 96 <template v-slot:footer>
95 - <uni-easyinput type="digit" v-model="item.lengthTolPos" :inputBorder="false"  
96 - placeholder="请输入长度公差上限" @input="onNonNegativeInput(idx, 'lengthTolPos')" @blur="onNonNegativeBlur(idx, 'lengthTolPos', 2)" /> 97 + <uni-easyinput type="text" v-model="item.lengthTolPos" :inputBorder="false"
  98 + placeholder="请输入长度公差上限" @input="onNumberInput(idx, 'lengthTolPos')" @blur="onNumberBlur(idx, 'lengthTolPos', 2)" />
97 </template> 99 </template>
98 </uni-list-item> 100 </uni-list-item>
99 <uni-list-item title="长度公差下限(mm)"> 101 <uni-list-item title="长度公差下限(mm)">
100 <template v-slot:footer> 102 <template v-slot:footer>
101 - <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false"  
102 - placeholder="请输入长度公差下限" @input="onNonNegativeInput(idx, 'lengthTolNeg')" @blur="onNonNegativeBlur(idx, 'lengthTolNeg', 2)" /> 103 + <uni-easyinput type="text" v-model="item.lengthTolNeg" :inputBorder="false"
  104 + placeholder="请输入长度公差下限" @input="onNumberInput(idx, 'lengthTolNeg')" @blur="onNumberBlur(idx, 'lengthTolNeg', 2)" />
103 </template> 105 </template>
104 </uni-list-item> 106 </uni-list-item>
105 <uni-list-item title="状态"> 107 <uni-list-item title="状态">
@@ -305,6 +307,27 @@ export default { @@ -305,6 +307,27 @@ export default {
305 this.$set(this.items, idx, it) 307 this.$set(this.items, idx, it)
306 if (field === 'quantity' || field === 'unitPrice') this.recalculate(idx) 308 if (field === 'quantity' || field === 'unitPrice') this.recalculate(idx)
307 }, 309 },
  310 + validate() {
  311 + for (let i = 0; i < this.items.length; i++) {
  312 + const it = this.items[i]
  313 + const check = (pos, neg, label) => {
  314 + if (pos !== '' && pos !== null && pos !== undefined &&
  315 + neg !== '' && neg !== null && neg !== undefined) {
  316 + if (Number(pos) <= Number(neg)) {
  317 + return `第${i + 1}行产品：${label}公差上限必须大于下限`
  318 + }
  319 + }
  320 + return null
  321 + }
  322 + let err = check(it.thicknessTolPos, it.thicknessTolNeg, '厚度')
  323 + if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
  324 + err = check(it.widthTolPos, it.widthTolNeg, '宽度')
  325 + if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
  326 + err = check(it.lengthTolPos, it.lengthTolNeg, '长度')
  327 + if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
  328 + }
  329 + return true
  330 + },
308 formatCurrency(val) { 331 formatCurrency(val) {
309 if (val == null || val === '') return '' 332 if (val == null || val === '') return ''
310 const num = Number(val) 333 const num = Number(val)
@@ -21,6 +21,12 @@ @@ -21,6 +21,12 @@
21 <view class="item-title"><text class="required">*</text><text>需方</text></view> 21 <view class="item-title"><text class="required">*</text><text>需方</text></view>
22 </template> 22 </template>
23 </uni-list-item> 23 </uni-list-item>
  24 + <uni-list-item class="select-item" :class="form.stockUpCompanyId ? 'is-filled' : 'is-empty'" clickable
  25 + @click="openRelate('stockUpCompanyId')" :rightText="form.stockUpCompanyName || '请选择备货单位'" showArrow>
  26 + <template v-slot:body>
  27 + <view class="item-title"><text class="required">*</text><text>备货单位/人（生产标准）</text></view>
  28 + </template>
  29 + </uni-list-item>
24 30
25 <uni-list-item title="订货日期"> 31 <uni-list-item title="订货日期">
26 <template v-slot:footer> 32 <template v-slot:footer>
@@ -39,7 +45,23 @@ @@ -39,7 +45,23 @@
39 <view class="item-title"><text class="required">*</text><text>生产厂</text></view> 45 <view class="item-title"><text class="required">*</text><text>生产厂</text></view>
40 </template> 46 </template>
41 </uni-list-item> 47 </uni-list-item>
42 - <ProductRel mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" @change="onProductsChange" :options="productList" /> 48 + <uni-list-item class="select-item" :class="form.deptName ? 'is-filled' : 'is-empty'">
  49 + <template v-slot:body>
  50 + <view class="item-title"><text class="required">*</text><text>办事处</text></view>
  51 + </template>
  52 + <template v-slot:footer>
  53 + <view class="serial-number-row">
  54 + <uni-easyinput v-model="form.deptName" :inputBorder="false" disabled />
  55 + </view>
  56 + </template>
  57 + </uni-list-item>
  58 + <uni-list-item class="select-item" :class="form.region ? 'is-filled' : 'is-empty'" clickable
  59 + @click="openSheet('region')" :rightText="displayLabel('regionName')" showArrow>
  60 + <template v-slot:body>
  61 + <view class="item-title"><text class="required">*</text><text>区域</text></view>
  62 + </template>
  63 + </uni-list-item>
  64 + <ProductRel ref="productRel" mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" @change="onProductsChange" :options="productList" />
43 <uni-list-item title="合计人民币金额（大写）"> 65 <uni-list-item title="合计人民币金额（大写）">
44 <template v-slot:footer> 66 <template v-slot:footer>
45 <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false" disabled /> 67 <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false" disabled />
@@ -208,10 +230,11 @@ import SingleSelectSheet from '@/components/single-select/index.vue' @@ -208,10 +230,11 @@ import SingleSelectSheet from '@/components/single-select/index.vue'
208 import RelateSelectSheet from '@/components/relate-select/index.vue' 230 import RelateSelectSheet from '@/components/relate-select/index.vue'
209 import ProductRel from './productRel.vue' 231 import ProductRel from './productRel.vue'
210 import CitySelector from '@/components/city-selector/index.vue' 232 import CitySelector from '@/components/city-selector/index.vue'
211 -import { getRetailCodeApi, createContractApi, getCustomerRemarks,getCustomerSpecificQualityRequirements } from '@/api/contract' 233 +import { getRetailCodeApi, createContractApi, getCustomerRemarks,getCustomerSpecificQualityRequirements, getDeptApi } from '@/api/contract'
212 import { getDicByCodes } from '@/utils/dic' 234 import { getDicByCodes } from '@/utils/dic'
213 import { formatCurrencyToChinese } from '@/utils/common' 235 import { formatCurrencyToChinese } from '@/utils/common'
214 import { workshopQueryApi } from '@/api/devManage' 236 import { workshopQueryApi } from '@/api/devManage'
  237 +import { getArea } from '@/api/credit_manage.js'
215 238
216 export default { 239 export default {
217 name: 'AddContractForeignUnplan', 240 name: 'AddContractForeignUnplan',
@@ -224,6 +247,8 @@ export default { @@ -224,6 +247,8 @@ export default {
224 supplierName: '', 247 supplierName: '',
225 buyer: '', 248 buyer: '',
226 buyerName: '', 249 buyerName: '',
  250 + stockUpCompanyId: '',
  251 + stockUpCompanyName: '',
227 orderDate: '', 252 orderDate: '',
228 deliveryDate: '', 253 deliveryDate: '',
229 designatedConsignee: '', 254 designatedConsignee: '',
@@ -242,6 +267,10 @@ export default { @@ -242,6 +267,10 @@ export default {
242 destinationLabel: '', 267 destinationLabel: '',
243 workshopIdName: '', 268 workshopIdName: '',
244 workshopId: '', 269 workshopId: '',
  270 + deptName: '',
  271 + deptId: '',
  272 + region: '',
  273 + regionName: '',
245 remarks: '', 274 remarks: '',
246 component: '', 275 component: '',
247 packaging: '', 276 packaging: '',
@@ -263,12 +292,15 @@ export default { @@ -263,12 +292,15 @@ export default {
263 productList: [], 292 productList: [],
264 customerRemarks: [], 293 customerRemarks: [],
265 defaultRemark: '', 294 defaultRemark: '',
  295 + regionOptions: [],
266 } 296 }
267 }, 297 },
268 created() { 298 created() {
269 this.loadSuppliers() 299 this.loadSuppliers()
270 this.loadExtraOptions() 300 this.loadExtraOptions()
271 this.initCode() 301 this.initCode()
  302 + this.getDept()
  303 + this.loadRegionOptions()
272 this.form.orderDate = this.formatDate(new Date()) 304 this.form.orderDate = this.formatDate(new Date())
273 this.$nextTick(() => { 305 this.$nextTick(() => {
274 if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) { 306 if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
@@ -317,6 +349,24 @@ export default { @@ -317,6 +349,24 @@ export default {
317 }, 349 },
318 }, 350 },
319 methods: { 351 methods: {
  352 + async loadRegionOptions() {
  353 + try {
  354 + const res = await getArea()
  355 + const list = res.data || []
  356 + this.regionOptions = (list || []).map(it => ({ label: it.name || '', value: it.id || '' }))
  357 + } catch (e) {
  358 + this.regionOptions = []
  359 + }
  360 + },
  361 + // 查询当前人所在办事处
  362 + getDept() {
  363 + getDeptApi().then(res => {
  364 + if (res.code === 200) {
  365 + this.form.deptName = res.data.name || ''
  366 + this.form.deptId = res.data.id || ''
  367 + }
  368 + })
  369 + },
320 getHistory() { 370 getHistory() {
321 console.log('this.productLineList', this.productLineList[0].productId) 371 console.log('this.productLineList', this.productLineList[0].productId)
322 if (!this.productLineList.length || !this.productLineList[0].productId) { 372 if (!this.productLineList.length || !this.productLineList[0].productId) {
@@ -404,7 +454,7 @@ export default { @@ -404,7 +454,7 @@ export default {
404 }, 454 },
405 displayLabel(field) { 455 displayLabel(field) {
406 const m = this.form 456 const m = this.form
407 - const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopIdName: '请选择生产厂' } 457 + const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopIdName: '请选择生产厂', regionName: '请选择区域' }
408 const val = m[field] 458 const val = m[field]
409 return val ? String(val) : map[field] 459 return val ? String(val) : map[field]
410 }, 460 },
@@ -449,6 +499,8 @@ export default { @@ -449,6 +499,8 @@ export default {
449 setSheet('单价中是否已包含运费', this.yesNoList) 499 setSheet('单价中是否已包含运费', this.yesNoList)
450 } else if (field === 'historyRemarks') { 500 } else if (field === 'historyRemarks') {
451 setSheet('历史备注', this.customerRemarks) 501 setSheet('历史备注', this.customerRemarks)
  502 + }else if (field === 'region') {
  503 + setSheet('区域', this.regionOptions)
452 } 504 }
453 }, 505 },
454 onSheetConfirm({ value, label }) { 506 onSheetConfirm({ value, label }) {
@@ -467,6 +519,8 @@ export default { @@ -467,6 +519,8 @@ export default {
467 let config = {} 519 let config = {}
468 if (fieldKey === 'buyer') { 520 if (fieldKey === 'buyer') {
469 config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] } 521 config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
  522 + } else if (fieldKey === 'stockUpCompanyId') {
  523 + config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
470 } 524 }
471 const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : [] 525 const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
472 this.sheet.visible = false 526 this.sheet.visible = false
@@ -477,7 +531,17 @@ export default { @@ -477,7 +531,17 @@ export default {
477 const _fieldKey = this.relate.fieldKey 531 const _fieldKey = this.relate.fieldKey
478 const first = (items && items.length > 0) ? items[0] : null 532 const first = (items && items.length > 0) ? items[0] : null
479 this.form[_fieldKey] = (first && first.id) ? first.id : '' 533 this.form[_fieldKey] = (first && first.id) ? first.id : ''
480 - this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : '' 534 +
  535 + if (_fieldKey === 'stockUpCompanyId') {
  536 + this.form.stockUpCompanyName = (first && first.name) ? first.name : ''
  537 + } else {
  538 + this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : ''
  539 + }
  540 +
  541 + if (_fieldKey === 'buyer') {
  542 + this.form.stockUpCompanyId = (first && first.id) ? first.id : ''
  543 + this.form.stockUpCompanyName = (first && first.name) ? first.name : ''
  544 + }
481 }, 545 },
482 onRadioSelect(field, nameField, opt) { 546 onRadioSelect(field, nameField, opt) {
483 const val = opt && opt.value != null ? opt.value : '' 547 const val = opt && opt.value != null ? opt.value : ''
@@ -489,6 +553,7 @@ export default { @@ -489,6 +553,7 @@ export default {
489 } 553 }
490 }, 554 },
491 async onSubmit() { 555 async onSubmit() {
  556 + if (this.$refs.productRel && !this.$refs.productRel.validate()) return
492 if (!this.validateRequired()) return 557 if (!this.validateRequired()) return
493 const confirmRes = await new Promise(resolve => { 558 const confirmRes = await new Promise(resolve => {
494 uni.showModal({ title: '提示', content: '确定新增经销未锁规合同吗？', confirmText: '确定', cancelText: '取消', success: resolve }) 559 uni.showModal({ title: '提示', content: '确定新增经销未锁规合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
@@ -533,9 +598,11 @@ export default { @@ -533,9 +598,11 @@ export default {
533 { key: 'code', label: '编号' }, 598 { key: 'code', label: '编号' },
534 { key: 'supplier', label: '供方' }, 599 { key: 'supplier', label: '供方' },
535 { key: 'buyer', label: '需方' }, 600 { key: 'buyer', label: '需方' },
  601 + { key: 'stockUpCompanyId', label: '备货单位/人（生产标准）' },
536 { key: 'orderDate', label: '订货日期' }, 602 { key: 'orderDate', label: '订货日期' },
537 { key: 'unit', label: '单位' }, 603 { key: 'unit', label: '单位' },
538 { key: 'workshopId', label: '生产厂' }, 604 { key: 'workshopId', label: '生产厂' },
  605 + { key: 'region', label: '区域' },
539 { key: 'specialTerms', label: '特别条款要求' }, 606 { key: 'specialTerms', label: '特别条款要求' },
540 ] 607 ]
541 for (const it of checks) { 608 for (const it of checks) {
@@ -9,11 +9,17 @@ @@ -9,11 +9,17 @@
9 }}</text></view> 9 }}</text></view>
10 <view class="row"><text class="label">需方</text><text class="value">{{ detail.buyerName || '-' 10 <view class="row"><text class="label">需方</text><text class="value">{{ detail.buyerName || '-'
11 }}</text></view> 11 }}</text></view>
  12 + <view class="row"><text class="label">备货单位/人（生产标准）</text><text class="value">{{ detail.stockUpCompanyName || '-'
  13 + }}</text></view>
12 <view class="row"><text class="label">订货日期</text><text class="value">{{ detail.orderDate }}</text> 14 <view class="row"><text class="label">订货日期</text><text class="value">{{ detail.orderDate }}</text>
13 </view> 15 </view>
14 <view class="row"><text class="label">单位</text><text class="value">{{ detail.unit }}</text></view> 16 <view class="row"><text class="label">单位</text><text class="value">{{ detail.unit }}</text></view>
15 <view class="row"><text class="label">生产厂</text><text class="value">{{ detail.workshopName || '-' 17 <view class="row"><text class="label">生产厂</text><text class="value">{{ detail.workshopName || '-'
16 }}</text></view> 18 }}</text></view>
  19 + <view class="row"><text class="label">办事处</text><text class="value">{{ detail.deptName || '-'
  20 + }}</text></view>
  21 + <view class="row"><text class="label">区域</text><text class="value">{{ detail.regionName || '-'
  22 + }}</text></view>
17 </view> 23 </view>
18 24
19 <view class="section1"> 25 <view class="section1">
@@ -139,10 +145,15 @@ export default { @@ -139,10 +145,15 @@ export default {
139 supplierName: '', 145 supplierName: '',
140 buyer: '', 146 buyer: '',
141 buyerName: '', 147 buyerName: '',
  148 + stockUpCompanyId: '',
  149 + stockUpCompanyName: '',
142 orderDate: '', 150 orderDate: '',
143 unit: '', 151 unit: '',
144 workshopId: '', 152 workshopId: '',
145 workshopName: '', 153 workshopName: '',
  154 + deptName: '',
  155 + region: '',
  156 + regionName: '',
146 designatedConsignee: '', 157 designatedConsignee: '',
147 specialTerms: '', 158 specialTerms: '',
148 specialTermsName: '', 159 specialTermsName: '',
@@ -461,6 +472,9 @@ export default { @@ -461,6 +472,9 @@ export default {
461 this.detail = { 472 this.detail = {
462 ...this.detail, 473 ...this.detail,
463 ...data, 474 ...data,
  475 + stockUpCompanyName: data.stockUpCompanyName || '',
  476 + regionName: data.regionName || '',
  477 + deptName: data.deptName || '',
464 includesPackagingFeeName, includesTransportFeeName, 478 includesPackagingFeeName, includesTransportFeeName,
465 destinationId: data.provinceId && data.cityId && data.districtId ? [data.provinceId, data.cityId, data.districtId] : '', 479 destinationId: data.provinceId && data.cityId && data.districtId ? [data.provinceId, data.cityId, data.districtId] : '',
466 destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '', 480 destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '',
@@ -22,12 +22,35 @@ @@ -22,12 +22,35 @@
22 </template> 22 </template>
23 </uni-list-item> 23 </uni-list-item>
24 24
  25 + <uni-list-item class="select-item" :class="form.stockUpCompanyId ? 'is-filled' : 'is-empty'" clickable
  26 + @click="openRelate('stockUpCompanyId')" :rightText="form.stockUpCompanyName || '请选择备货单位'" showArrow>
  27 + <template v-slot:body>
  28 + <view class="item-title"><text class="required">*</text><text>备货单位/人（生产标准）</text></view>
  29 + </template>
  30 + </uni-list-item>
  31 +
25 <uni-list-item class="select-item" :class="form.workshopId ? 'is-filled' : 'is-empty'" clickable 32 <uni-list-item class="select-item" :class="form.workshopId ? 'is-filled' : 'is-empty'" clickable
26 @click="openSheet('workshopId')" :rightText="form.workshopName || '请选择生产厂'" showArrow> 33 @click="openSheet('workshopId')" :rightText="form.workshopName || '请选择生产厂'" showArrow>
27 <template v-slot:body> 34 <template v-slot:body>
28 <view class="item-title"><text class="required">*</text><text>生产厂</text></view> 35 <view class="item-title"><text class="required">*</text><text>生产厂</text></view>
29 </template> 36 </template>
30 </uni-list-item> 37 </uni-list-item>
  38 + <uni-list-item class="select-item" :class="form.deptName ? 'is-filled' : 'is-empty'">
  39 + <template v-slot:body>
  40 + <view class="item-title"><text class="required">*</text><text>办事处</text></view>
  41 + </template>
  42 + <template v-slot:footer>
  43 + <view class="serial-number-row">
  44 + <uni-easyinput v-model="form.deptName" :inputBorder="false" disabled />
  45 + </view>
  46 + </template>
  47 + </uni-list-item>
  48 + <uni-list-item class="select-item" :class="form.region ? 'is-filled' : 'is-empty'" clickable
  49 + @click="openSheet('region')" :rightText="displayLabel('regionName')" showArrow>
  50 + <template v-slot:body>
  51 + <view class="item-title"><text class="required">*</text><text>区域</text></view>
  52 + </template>
  53 + </uni-list-item>
31 54
32 <uni-list-item title="订货日期"> 55 <uni-list-item title="订货日期">
33 <template v-slot:footer> 56 <template v-slot:footer>
@@ -41,7 +64,7 @@ @@ -41,7 +64,7 @@
41 </template> 64 </template>
42 </uni-list-item> 65 </uni-list-item>
43 66
44 - <ProductRel mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" :list="productLineList" @change="onProductsChange" :options="productList" /> 67 + <ProductRel ref="productRel" mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" :list="productLineList" @change="onProductsChange" :options="productList" />
45 68
46 <uni-list-item title="合计人民币金额（大写）"> 69 <uni-list-item title="合计人民币金额（大写）">
47 <template v-slot:footer> 70 <template v-slot:footer>
@@ -198,6 +221,8 @@ import { getContractApi, updateContractApi } from '@/api/contract' @@ -198,6 +221,8 @@ import { getContractApi, updateContractApi } from '@/api/contract'
198 import { getDicByCodes } from '@/utils/dic' 221 import { getDicByCodes } from '@/utils/dic'
199 import { formatCurrencyToChinese } from '@/utils/common' 222 import { formatCurrencyToChinese } from '@/utils/common'
200 import { workshopQueryApi } from '@/api/devManage' 223 import { workshopQueryApi } from '@/api/devManage'
  224 +import { getArea } from '@/api/credit_manage.js'
  225 +
201 export default { 226 export default {
202 name: 'ModifyContractForeignUnplan', 227 name: 'ModifyContractForeignUnplan',
203 components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector }, 228 components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector },
@@ -211,8 +236,14 @@ export default { @@ -211,8 +236,14 @@ export default {
211 supplierName: '', 236 supplierName: '',
212 buyer: '', 237 buyer: '',
213 buyerName: '', 238 buyerName: '',
  239 + stockUpCompanyId: '',
  240 + stockUpCompanyName: '',
214 workshopId: '', 241 workshopId: '',
215 workshopName: '', 242 workshopName: '',
  243 + region: '',
  244 + regionName: '',
  245 + deptName: '',
  246 + deptId: '',
216 orderDate: '', 247 orderDate: '',
217 deliveryDate: '', 248 deliveryDate: '',
218 designatedConsignee: '', 249 designatedConsignee: '',
@@ -253,7 +284,8 @@ export default { @@ -253,7 +284,8 @@ export default {
253 totalAmountIncludingTax: 0, 284 totalAmountIncludingTax: 0,
254 productLineList: [], 285 productLineList: [],
255 newProductLineList: [], 286 newProductLineList: [],
256 - productList: [] 287 + productList: [],
  288 + regionOptions: []
257 } 289 }
258 }, 290 },
259 onLoad(query) { 291 onLoad(query) {
@@ -262,6 +294,7 @@ export default { @@ -262,6 +294,7 @@ export default {
262 created() { 294 created() {
263 this.loadSuppliers() 295 this.loadSuppliers()
264 this.loadExtraOptions() 296 this.loadExtraOptions()
  297 + this.loadRegionOptions()
265 this.loadDetail() 298 this.loadDetail()
266 this.$nextTick(() => { 299 this.$nextTick(() => {
267 if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) { 300 if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
@@ -270,6 +303,15 @@ export default { @@ -270,6 +303,15 @@ export default {
270 }) 303 })
271 }, 304 },
272 methods: { 305 methods: {
  306 + async loadRegionOptions() {
  307 + try {
  308 + const res = await getArea()
  309 + const list = res.data || []
  310 + this.regionOptions = (list || []).map(it => ({ label: it.name || '', value: it.id || '' }))
  311 + } catch (e) {
  312 + this.regionOptions = []
  313 + }
  314 + },
273 async loadDetail() { 315 async loadDetail() {
274 if (!this.id) return 316 if (!this.id) return
275 try { 317 try {
@@ -286,6 +328,8 @@ export default { @@ -286,6 +328,8 @@ export default {
286 supplierName: m.supplierName || '', 328 supplierName: m.supplierName || '',
287 buyer: m.buyer || (m.customer && m.customer.id) || '', 329 buyer: m.buyer || (m.customer && m.customer.id) || '',
288 buyerName: m.buyerName || (m.customer && m.customer.name) || '', 330 buyerName: m.buyerName || (m.customer && m.customer.name) || '',
  331 + stockUpCompanyId: m.stockUpCompanyId || '',
  332 + stockUpCompanyName: m.stockUpCompanyName || '',
289 orderDate: m.orderDate || '', 333 orderDate: m.orderDate || '',
290 designatedConsignee: m.designatedConsignee || '', 334 designatedConsignee: m.designatedConsignee || '',
291 specialTerms: m.specialTerms || '', 335 specialTerms: m.specialTerms || '',
@@ -315,6 +359,10 @@ export default { @@ -315,6 +359,10 @@ export default {
315 packaging: m.packaging || '', 359 packaging: m.packaging || '',
316 workshopId: m.workshopId || '', 360 workshopId: m.workshopId || '',
317 workshopName: m.workshopName || '', 361 workshopName: m.workshopName || '',
  362 + region: m.region || '',
  363 + regionName: m.regionName || '',
  364 + deptName: m.deptName || '',
  365 + deptId: m.deptId || '',
318 } 366 }
319 const lines = Array.isArray(m.contractDistributorLineList) ? m.contractDistributorLineList : [] 367 const lines = Array.isArray(m.contractDistributorLineList) ? m.contractDistributorLineList : []
320 this.productLineList = lines 368 this.productLineList = lines
@@ -370,7 +418,7 @@ export default { @@ -370,7 +418,7 @@ export default {
370 }, 418 },
371 displayLabel(field) { 419 displayLabel(field) {
372 const m = this.form 420 const m = this.form
373 - const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopName: '请选择生产厂' } 421 + const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopName: '请选择生产厂', regionName: '请选择区域' }
374 const val = m[field] 422 const val = m[field]
375 return val ? String(val) : map[field] 423 return val ? String(val) : map[field]
376 }, 424 },
@@ -399,6 +447,8 @@ export default { @@ -399,6 +447,8 @@ export default {
399 setSheet('单价中是否已包含包装费', this.yesNoList) 447 setSheet('单价中是否已包含包装费', this.yesNoList)
400 } else if (field === 'includesTransportFee') { 448 } else if (field === 'includesTransportFee') {
401 setSheet('单价中是否已包含运费', this.yesNoList) 449 setSheet('单价中是否已包含运费', this.yesNoList)
  450 + } else if (field === 'region') {
  451 + setSheet('区域', this.regionOptions)
402 } 452 }
403 }, 453 },
404 onSheetConfirm({ value, label }) { 454 onSheetConfirm({ value, label }) {
@@ -412,6 +462,8 @@ export default { @@ -412,6 +462,8 @@ export default {
412 let config = {} 462 let config = {}
413 if (fieldKey === 'buyer') { 463 if (fieldKey === 'buyer') {
414 config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] } 464 config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
  465 + } else if (fieldKey === 'stockUpCompanyId') {
  466 + config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
415 } 467 }
416 const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : [] 468 const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
417 this.sheet.visible = false 469 this.sheet.visible = false
@@ -422,7 +474,12 @@ export default { @@ -422,7 +474,12 @@ export default {
422 const _fieldKey = this.relate.fieldKey 474 const _fieldKey = this.relate.fieldKey
423 const first = (items && items.length > 0) ? items[0] : null 475 const first = (items && items.length > 0) ? items[0] : null
424 this.form[_fieldKey] = (first && first.id) ? first.id : '' 476 this.form[_fieldKey] = (first && first.id) ? first.id : ''
425 - this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : '' 477 +
  478 + if (_fieldKey === 'stockUpCompanyId') {
  479 + this.form.stockUpCompanyName = (first && first.name) ? first.name : ''
  480 + } else {
  481 + this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : ''
  482 + }
426 }, 483 },
427 onRadioSelect(field, nameField, opt) { 484 onRadioSelect(field, nameField, opt) {
428 const val = opt && opt.value != null ? opt.value : '' 485 const val = opt && opt.value != null ? opt.value : ''
@@ -438,9 +495,11 @@ export default { @@ -438,9 +495,11 @@ export default {
438 { key: 'code', label: '编号' }, 495 { key: 'code', label: '编号' },
439 { key: 'supplier', label: '供方' }, 496 { key: 'supplier', label: '供方' },
440 { key: 'buyer', label: '需方' }, 497 { key: 'buyer', label: '需方' },
  498 + { key: 'stockUpCompanyId', label: '备货单位/人（生产标准）' },
441 { key: 'orderDate', label: '订货日期' }, 499 { key: 'orderDate', label: '订货日期' },
442 { key: 'unit', label: '单位' }, 500 { key: 'unit', label: '单位' },
443 { key: 'workshopId', label: '生产厂' }, 501 { key: 'workshopId', label: '生产厂' },
  502 + { key: 'region', label: '区域' },
444 { key: 'specialTerms', label: '特别条款要求' }, 503 { key: 'specialTerms', label: '特别条款要求' },
445 ] 504 ]
446 for (const it of checks) { 505 for (const it of checks) {
@@ -470,8 +529,8 @@ export default { @@ -470,8 +529,8 @@ export default {
470 return true 529 return true
471 }, 530 },
472 async onSubmit() { 531 async onSubmit() {
473 - console.log('onSubmit__payload', payload)  
474 if (!this.validateRequired()) return 532 if (!this.validateRequired()) return
  533 + if (this.$refs.productRel && !this.$refs.productRel.validate()) return
475 const confirmRes = await new Promise(resolve => { 534 const confirmRes = await new Promise(resolve => {
476 uni.showModal({ title: '提示', content: '确定保存当前经销未锁规合同吗？', confirmText: '确定', cancelText: '取消', success: resolve }) 535 uni.showModal({ title: '提示', content: '确定保存当前经销未锁规合同吗？', confirmText: '确定', cancelText: '取消', success: resolve })
477 }) 536 })
@@ -286,6 +286,73 @@ export default { @@ -286,6 +286,73 @@ export default {
286 const m = Math.pow(10, digits) 286 const m = Math.pow(10, digits)
287 return Math.round(n * m) / m 287 return Math.round(n * m) / m
288 }, 288 },
  289 + onNumberInput(idx, field) {
  290 + const it = this.items[idx]
  291 + if (!it) return
  292 + // 允许负号和小数点
  293 + let v = String(it[field] != null ? it[field] : '')
  294 + // 先只保留数字、小数点、负号
  295 + v = v.replace(/[^0-9.-]/g, '')
  296 + // 处理负号：只有第一个位置可以是负号，如果后面出现负号则移除
  297 + if (v.lastIndexOf('-') > 0) {
  298 + const hasMinusAtStart = v.startsWith('-')
  299 + v = v.replace(/-/g, '')
  300 + if (hasMinusAtStart) v = '-' + v
  301 + }
  302 + // 处理小数点：只保留第一个小数点
  303 + if ((v.match(/\./g) || []).length > 1) {
  304 + const firstDotIndex = v.indexOf('.')
  305 + v = v.substring(0, firstDotIndex + 1) + v.substring(firstDotIndex + 1).replace(/\./g, '')
  306 + }
  307 + // 处理特殊情况：.5 -> 0.5, -.5 -> -0.5
  308 + if (v.startsWith('.')) v = '0' + v
  309 + if (v.startsWith('-.')) v = '-0' + v.substring(1)
  310 +
  311 + it[field] = v
  312 + this.$set(this.items, idx, it)
  313 + },
  314 + onNumberBlur(idx, field, digits = 2) {
  315 + const it = this.items[idx]
  316 + if (!it) return
  317 + let v = it[field]
  318 + if (v === '' || v === '-' || v === null || v === undefined) {
  319 + // 如果为空或只有一个负号，不处理或置空，看需求，这里保持原值或空
  320 + } else {
  321 + // 转为数字并保留小数位
  322 + const num = Number(v)
  323 + if (!isNaN(num)) {
  324 + it[field] = this.round(num, digits)
  325 + } else {
  326 + it[field] = ''
  327 + }
  328 + }
  329 + this.$set(this.items, idx, it)
  330 + },
  331 + validate() {
  332 + for (let i = 0; i < this.items.length; i++) {
  333 + const it = this.items[i]
  334 + const check = (pos, neg, label) => {
  335 + // 只有当上限和下限都有值时才校验
  336 + if (pos !== '' && pos !== null && pos !== undefined &&
  337 + neg !== '' && neg !== null && neg !== undefined) {
  338 + if (Number(pos) <= Number(neg)) {
  339 + return `第${i + 1}行产品：${label}公差上限必须大于下限`
  340 + }
  341 + }
  342 + return null
  343 + }
  344 +
  345 + let err = check(it.thicknessTolPos, it.thicknessTolNeg, '厚度')
  346 + if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
  347 +
  348 + err = check(it.widthTolPos, it.widthTolNeg, '宽度')
  349 + if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
  350 +
  351 + err = check(it.lengthTolPos, it.lengthTolNeg, '长度')
  352 + if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
  353 + }
  354 + return true
  355 + },
289 onNonNegativeBlur(idx, field, digits) { 356 onNonNegativeBlur(idx, field, digits) {
290 const it = this.items[idx] 357 const it = this.items[idx]
291 if (!it) return 358 if (!it) return
@@ -21,6 +21,12 @@ @@ -21,6 +21,12 @@
21 <view class="item-title"><text class="required">*</text><text>定作方</text></view> 21 <view class="item-title"><text class="required">*</text><text>定作方</text></view>
22 </template> 22 </template>
23 </uni-list-item> 23 </uni-list-item>
  24 + <uni-list-item class="select-item" :class="form.stockUpCompanyId ? 'is-filled' : 'is-empty'" clickable
  25 + @click="openRelate('stockUpCompanyId')" :rightText="form.stockUpCompanyName || '请选择备货单位'" showArrow>
  26 + <template v-slot:body>
  27 + <view class="item-title"><text class="required">*</text><text>备货单位/人（生产标准）</text></view>
  28 + </template>
  29 + </uni-list-item>
24 30
25 <uni-list-item title="订货日期"> 31 <uni-list-item title="订货日期">
26 <template v-slot:footer> 32 <template v-slot:footer>
@@ -39,7 +45,23 @@ @@ -39,7 +45,23 @@
39 <view class="item-title"><text class="required">*</text><text>生产厂</text></view> 45 <view class="item-title"><text class="required">*</text><text>生产厂</text></view>
40 </template> 46 </template>
41 </uni-list-item> 47 </uni-list-item>
42 - <ProductRel mode="add" :deliveryDateBase="form.deliveryDate" :deliveryDate="form.orderDate" @change="onProductsChange" :options="productList" :rawToProdRatioList="rawToProdRatioList" /> 48 + <uni-list-item class="select-item" :class="form.deptName ? 'is-filled' : 'is-empty'">
  49 + <template v-slot:body>
  50 + <view class="item-title"><text class="required">*</text><text>办事处</text></view>
  51 + </template>
  52 + <template v-slot:footer>
  53 + <view class="serial-number-row">
  54 + <uni-easyinput v-model="form.deptName" :inputBorder="false" disabled />
  55 + </view>
  56 + </template>
  57 + </uni-list-item>
  58 + <uni-list-item class="select-item" :class="form.region ? 'is-filled' : 'is-empty'" clickable
  59 + @click="openSheet('region')" :rightText="displayLabel('regionName')" showArrow>
  60 + <template v-slot:body>
  61 + <view class="item-title"><text class="required">*</text><text>区域</text></view>
  62 + </template>
  63 + </uni-list-item>
  64 + <ProductRel ref="productRel" mode="add" :deliveryDateBase="form.deliveryDate" :deliveryDate="form.orderDate" @change="onProductsChange" :options="productList" :rawToProdRatioList="rawToProdRatioList" />
43 <uni-list-item title="合计人民币金额（大写）"> 65 <uni-list-item title="合计人民币金额（大写）">
44 <template v-slot:footer> 66 <template v-slot:footer>
45 <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false" disabled /> 67 <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false" disabled />
@@ -208,10 +230,11 @@ import SingleSelectSheet from '@/components/single-select/index.vue' @@ -208,10 +230,11 @@ import SingleSelectSheet from '@/components/single-select/index.vue'
208 import RelateSelectSheet from '@/components/relate-select/index.vue' 230 import RelateSelectSheet from '@/components/relate-select/index.vue'
209 import ProductRel from './productRel.vue' 231 import ProductRel from './productRel.vue'
210 import CitySelector from '@/components/city-selector/index.vue' 232 import CitySelector from '@/components/city-selector/index.vue'
211 -import { getRetailCodeApi, createContractApi, getCustomerRemarks,getCustomerSpecificQualityRequirements } from '@/api/contract' 233 +import { getRetailCodeApi, createContractApi, getCustomerRemarks,getCustomerSpecificQualityRequirements, getDeptApi } from '@/api/contract'
212 import { getDicByCodes } from '@/utils/dic' 234 import { getDicByCodes } from '@/utils/dic'
213 import { formatCurrencyToChinese } from '@/utils/common' 235 import { formatCurrencyToChinese } from '@/utils/common'
214 import { workshopQueryApi } from '@/api/devManage' 236 import { workshopQueryApi } from '@/api/devManage'
  237 +import { getArea } from '@/api/credit_manage.js'
215 238
216 export default { 239 export default {
217 name: 'AddContractProcess', 240 name: 'AddContractProcess',
@@ -224,6 +247,8 @@ export default { @@ -224,6 +247,8 @@ export default {
224 supplierName: '', 247 supplierName: '',
225 buyer: '', 248 buyer: '',
226 buyerName: '', 249 buyerName: '',
  250 + stockUpCompanyId: '',
  251 + stockUpCompanyName: '',
227 orderDate: '', 252 orderDate: '',
228 deliveryDate: '', 253 deliveryDate: '',
229 designatedConsignee: '', 254 designatedConsignee: '',
@@ -242,6 +267,10 @@ export default { @@ -242,6 +267,10 @@ export default {
242 destinationLabel: '', 267 destinationLabel: '',
243 workshopIdName: '', 268 workshopIdName: '',
244 workshopId: '', 269 workshopId: '',
  270 + deptName: '',
  271 + deptId: '',
  272 + region: '',
  273 + regionName: '',
245 remarks: '', 274 remarks: '',
246 component: '', 275 component: '',
247 packaging: '', 276 packaging: '',
@@ -261,15 +290,18 @@ export default { @@ -261,15 +290,18 @@ export default {
261 totalAmountIncludingTax: 0, 290 totalAmountIncludingTax: 0,
262 productLineList: [], 291 productLineList: [],
263 productList: [], 292 productList: [],
264 - rawToProdRatioList: [],  
265 customerRemarks: [], 293 customerRemarks: [],
266 defaultRemark: '', 294 defaultRemark: '',
  295 + regionOptions: [],
  296 + rawToProdRatioList: [],
267 } 297 }
268 }, 298 },
269 created() { 299 created() {
270 this.loadSuppliers() 300 this.loadSuppliers()
271 this.loadExtraOptions() 301 this.loadExtraOptions()
272 this.initCode() 302 this.initCode()
  303 + this.getDept()
  304 + this.loadRegionOptions()
273 this.form.orderDate = this.formatDate(new Date()) 305 this.form.orderDate = this.formatDate(new Date())
274 this.$nextTick(() => { 306 this.$nextTick(() => {
275 if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) { 307 if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
@@ -318,6 +350,24 @@ export default { @@ -318,6 +350,24 @@ export default {
318 }, 350 },
319 }, 351 },
320 methods: { 352 methods: {
  353 + async loadRegionOptions() {
  354 + try {
  355 + const res = await getArea()
  356 + const list = res.data || []
  357 + this.regionOptions = (list || []).map(it => ({ label: it.name || '', value: it.id || '' }))
  358 + } catch (e) {
  359 + this.regionOptions = []
  360 + }
  361 + },
  362 + // 查询当前人所在办事处
  363 + getDept() {
  364 + getDeptApi().then(res => {
  365 + if (res.code === 200) {
  366 + this.form.deptName = res.data.name || ''
  367 + this.form.deptId = res.data.id || ''
  368 + }
  369 + })
  370 + },
321 getHistory() { 371 getHistory() {
322 console.log('this.productLineList', this.productLineList[0].rawProductId) 372 console.log('this.productLineList', this.productLineList[0].rawProductId)
323 if (!this.productLineList.length || !this.productLineList[0].rawProductId) { 373 if (!this.productLineList.length || !this.productLineList[0].rawProductId) {
@@ -408,7 +458,7 @@ export default { @@ -408,7 +458,7 @@ export default {
408 }, 458 },
409 displayLabel(field) { 459 displayLabel(field) {
410 const m = this.form 460 const m = this.form
411 - const map = { supplierName: '请选择承揽方', buyerName: '请选择定作方', workshopIdName: '请选择生产厂' } 461 + const map = { supplierName: '请选择承揽方', buyerName: '请选择定作方', workshopIdName: '请选择生产厂', regionName: '请选择区域' }
412 const val = m[field] 462 const val = m[field]
413 return val ? String(val) : map[field] 463 return val ? String(val) : map[field]
414 }, 464 },
@@ -453,6 +503,8 @@ export default { @@ -453,6 +503,8 @@ export default {
453 setSheet('单价中是否已包含运费', this.yesNoList) 503 setSheet('单价中是否已包含运费', this.yesNoList)
454 } else if (field === 'historyRemarks') { 504 } else if (field === 'historyRemarks') {
455 setSheet('历史备注', this.customerRemarks) 505 setSheet('历史备注', this.customerRemarks)
  506 + }else if (field === 'region') {
  507 + setSheet('区域', this.regionOptions)
456 } 508 }
457 }, 509 },
458 onSheetConfirm({ value, label }) { 510 onSheetConfirm({ value, label }) {
@@ -471,6 +523,8 @@ export default { @@ -471,6 +523,8 @@ export default {
471 let config = {} 523 let config = {}
472 if (fieldKey === 'buyer') { 524 if (fieldKey === 'buyer') {
473 config = { title: '定作方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] } 525 config = { title: '定作方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
  526 + } else if (fieldKey === 'stockUpCompanyId') {
  527 + config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
474 } 528 }
475 const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : [] 529 const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
476 this.sheet.visible = false 530 this.sheet.visible = false
@@ -481,7 +535,17 @@ export default { @@ -481,7 +535,17 @@ export default {
481 const _fieldKey = this.relate.fieldKey 535 const _fieldKey = this.relate.fieldKey
482 const first = (items && items.length > 0) ? items[0] : null 536 const first = (items && items.length > 0) ? items[0] : null
483 this.form[_fieldKey] = (first && first.id) ? first.id : '' 537 this.form[_fieldKey] = (first && first.id) ? first.id : ''
484 - this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : '' 538 +
  539 + if (_fieldKey === 'stockUpCompanyId') {
  540 + this.form.stockUpCompanyName = (first && first.name) ? first.name : ''
  541 + } else {
  542 + this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : ''
  543 + }
  544 +
  545 + if (_fieldKey === 'buyer') {
  546 + this.form.stockUpCompanyId = (first && first.id) ? first.id : ''
  547 + this.form.stockUpCompanyName = (first && first.name) ? first.name : ''
  548 + }
485 }, 549 },
486 onRadioSelect(field, nameField, opt) { 550 onRadioSelect(field, nameField, opt) {
487 const val = opt && opt.value != null ? opt.value : '' 551 const val = opt && opt.value != null ? opt.value : ''
@@ -542,9 +606,11 @@ export default { @@ -542,9 +606,11 @@ export default {
542 { key: 'code', label: '编号' }, 606 { key: 'code', label: '编号' },
543 { key: 'supplier', label: '承揽方' }, 607 { key: 'supplier', label: '承揽方' },
544 { key: 'buyer', label: '定作方' }, 608 { key: 'buyer', label: '定作方' },
  609 + { key: 'stockUpCompanyId', label: '备货单位/人（生产标准）' },
545 { key: 'orderDate', label: '订货日期' }, 610 { key: 'orderDate', label: '订货日期' },
546 - { key: 'workshopId', label: '生产厂' },  
547 { key: 'unit', label: '单位' }, 611 { key: 'unit', label: '单位' },
  612 + { key: 'workshopId', label: '生产厂' },
  613 + { key: 'region', label: '区域' },
548 { key: 'specialTerms', label: '特别条款要求' }, 614 { key: 'specialTerms', label: '特别条款要求' },
549 ] 615 ]
550 for (const it of checks) { 616 for (const it of checks) {
@@ -552,6 +618,7 @@ export default { @@ -552,6 +618,7 @@ export default {
552 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val))) 618 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
553 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false } 619 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
554 } 620 }
  621 + if (this.$refs.productRel && !this.$refs.productRel.validate()) return false
555 const list = Array.isArray(this.productLineList) ? this.productLineList : [] 622 const list = Array.isArray(this.productLineList) ? this.productLineList : []
556 if (list.length === 0) { 623 if (list.length === 0) {
557 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false 624 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false
@@ -9,11 +9,17 @@ statusStyl<template> @@ -9,11 +9,17 @@ statusStyl<template>
9 }}</text></view> 9 }}</text></view>
10 <view class="row"><text class="label">定作方</text><text class="value">{{ detail.buyerName || '-' 10 <view class="row"><text class="label">定作方</text><text class="value">{{ detail.buyerName || '-'
11 }}</text></view> 11 }}</text></view>
  12 + <view class="row"><text class="label">备货单位/人（生产标准）</text><text class="value">{{ detail.stockUpCompanyName || '-'
  13 + }}</text></view>
12 <view class="row"><text class="label">订货日期</text><text class="value">{{ detail.orderDate }}</text> 14 <view class="row"><text class="label">订货日期</text><text class="value">{{ detail.orderDate }}</text>
13 </view> 15 </view>
14 <view class="row"><text class="label">单位</text><text class="value">{{ detail.unit }}</text></view> 16 <view class="row"><text class="label">单位</text><text class="value">{{ detail.unit }}</text></view>
15 <view class="row"><text class="label">生产厂</text><text class="value">{{ detail.workshopName || '-' 17 <view class="row"><text class="label">生产厂</text><text class="value">{{ detail.workshopName || '-'
16 - }}</text></view> 18 + }}</text></view>
  19 + <view class="row"><text class="label">办事处</text><text class="value">{{ detail.deptName || '-'
  20 + }}</text></view>
  21 + <view class="row"><text class="label">区域</text><text class="value">{{ detail.regionName || '-'
  22 + }}</text></view>
17 </view> 23 </view>
18 24
19 <view class="section1"> 25 <view class="section1">
@@ -129,10 +135,15 @@ export default { @@ -129,10 +135,15 @@ export default {
129 supplierName: '', 135 supplierName: '',
130 buyer: '', 136 buyer: '',
131 buyerName: '', 137 buyerName: '',
  138 + stockUpCompanyId: '',
  139 + stockUpCompanyName: '',
132 orderDate: '', 140 orderDate: '',
133 unit: '', 141 unit: '',
134 workshopId: '', 142 workshopId: '',
135 workshopName: '', 143 workshopName: '',
  144 + deptName: '',
  145 + region: '',
  146 + regionName: '',
136 designatedConsignee: '', 147 designatedConsignee: '',
137 specialTerms: '', 148 specialTerms: '',
138 specialTermsName: '', 149 specialTermsName: '',
@@ -352,9 +363,12 @@ export default { @@ -352,9 +363,12 @@ export default {
352 const data = res && res.data ? res.data : {} 363 const data = res && res.data ? res.data : {}
353 const includesPackagingFeeName = data.includesPackagingFeeName || (data.includesPackagingFee ? '是' : '否') 364 const includesPackagingFeeName = data.includesPackagingFeeName || (data.includesPackagingFee ? '是' : '否')
354 const includesTransportFeeName = data.includesTransportFeeName || (data.includesTransportFee ? '是' : '否') 365 const includesTransportFeeName = data.includesTransportFeeName || (data.includesTransportFee ? '是' : '否')
355 - this.detail = {  
356 - ...this.detail,  
357 - ...data, 366 + this.detail = {
  367 + ...this.detail,
  368 + ...data,
  369 + stockUpCompanyName: data.stockUpCompanyName || '',
  370 + regionName: data.regionName || '',
  371 + deptName: data.deptName || '',
358 includesPackagingFeeName, includesTransportFeeName, 372 includesPackagingFeeName, includesTransportFeeName,
359 destinationId: data.provinceId && data.cityId && data.districtId ? [data.provinceId, data.cityId, data.districtId] : '', 373 destinationId: data.provinceId && data.cityId && data.districtId ? [data.provinceId, data.cityId, data.districtId] : '',
360 destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '', 374 destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '',
@@ -199,6 +199,8 @@ import { getContractApi, updateContractApi } from '@/api/contract' @@ -199,6 +199,8 @@ import { getContractApi, updateContractApi } from '@/api/contract'
199 import { getDicByCodes } from '@/utils/dic' 199 import { getDicByCodes } from '@/utils/dic'
200 import { formatCurrencyToChinese } from '@/utils/common' 200 import { formatCurrencyToChinese } from '@/utils/common'
201 import { workshopQueryApi } from '@/api/devManage' 201 import { workshopQueryApi } from '@/api/devManage'
  202 +import { getArea } from '@/api/credit_manage.js'
  203 +
202 export default { 204 export default {
203 name: 'ModifyContractProcess', 205 name: 'ModifyContractProcess',
204 components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector }, 206 components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector },
@@ -212,8 +214,14 @@ export default { @@ -212,8 +214,14 @@ export default {
212 supplierName: '', 214 supplierName: '',
213 buyer: '', 215 buyer: '',
214 buyerName: '', 216 buyerName: '',
  217 + stockUpCompanyId: '',
  218 + stockUpCompanyName: '',
215 workshopId: '', 219 workshopId: '',
216 workshopName: '', 220 workshopName: '',
  221 + region: '',
  222 + regionName: '',
  223 + deptName: '',
  224 + deptId: '',
217 orderDate: '', 225 orderDate: '',
218 deliveryDate: '', 226 deliveryDate: '',
219 designatedConsignee: '', 227 designatedConsignee: '',
@@ -255,6 +263,7 @@ export default { @@ -255,6 +263,7 @@ export default {
255 productLineList: [], 263 productLineList: [],
256 newProductLineList: [], 264 newProductLineList: [],
257 productList: [], 265 productList: [],
  266 + regionOptions: [],
258 rawToProdRatioList: [], 267 rawToProdRatioList: [],
259 } 268 }
260 }, 269 },
@@ -264,6 +273,7 @@ export default { @@ -264,6 +273,7 @@ export default {
264 created() { 273 created() {
265 this.loadSuppliers() 274 this.loadSuppliers()
266 this.loadExtraOptions() 275 this.loadExtraOptions()
  276 + this.loadRegionOptions()
267 this.loadDetail() 277 this.loadDetail()
268 this.$nextTick(() => { 278 this.$nextTick(() => {
269 if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) { 279 if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
@@ -272,6 +282,15 @@ export default { @@ -272,6 +282,15 @@ export default {
272 }) 282 })
273 }, 283 },
274 methods: { 284 methods: {
  285 + async loadRegionOptions() {
  286 + try {
  287 + const res = await getArea()
  288 + const list = res.data || []
  289 + this.regionOptions = (list || []).map(it => ({ label: it.name || '', value: it.id || '' }))
  290 + } catch (e) {
  291 + this.regionOptions = []
  292 + }
  293 + },
275 async loadDetail() { 294 async loadDetail() {
276 if (!this.id) return 295 if (!this.id) return
277 try { 296 try {
@@ -288,6 +307,8 @@ export default { @@ -288,6 +307,8 @@ export default {
288 supplierName: m.supplierName || '', 307 supplierName: m.supplierName || '',
289 buyer: m.buyer || (m.customer && m.customer.id) || '', 308 buyer: m.buyer || (m.customer && m.customer.id) || '',
290 buyerName: m.buyerName || (m.customer && m.customer.name) || '', 309 buyerName: m.buyerName || (m.customer && m.customer.name) || '',
  310 + stockUpCompanyId: m.stockUpCompanyId || '',
  311 + stockUpCompanyName: m.stockUpCompanyName || '',
291 orderDate: m.orderDate || '', 312 orderDate: m.orderDate || '',
292 designatedConsignee: m.designatedConsignee || '', 313 designatedConsignee: m.designatedConsignee || '',
293 specialTerms: m.specialTerms || '', 314 specialTerms: m.specialTerms || '',
@@ -317,6 +338,10 @@ export default { @@ -317,6 +338,10 @@ export default {
317 packaging: m.packaging || '', 338 packaging: m.packaging || '',
318 workshopId: m.workshopId || '', 339 workshopId: m.workshopId || '',
319 workshopName: m.workshopName || '', 340 workshopName: m.workshopName || '',
  341 + region: m.region || '',
  342 + regionName: m.regionName || '',
  343 + deptName: m.deptName || '',
  344 + deptId: m.deptId || '',
320 } 345 }
321 const lines = Array.isArray(m.contractStdProcessingLineList) ? m.contractStdProcessingLineList : [] 346 const lines = Array.isArray(m.contractStdProcessingLineList) ? m.contractStdProcessingLineList : []
322 this.productLineList = lines 347 this.productLineList = lines
@@ -453,6 +478,7 @@ export default { @@ -453,6 +478,7 @@ export default {
453 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val))) 478 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
454 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false } 479 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
455 } 480 }
  481 + if (this.$refs.productRel && !this.$refs.productRel.validate()) return false
456 const list = Array.isArray(this.newProductLineList) ? this.newProductLineList : [] 482 const list = Array.isArray(this.newProductLineList) ? this.newProductLineList : []
457 if (list.length === 0) { 483 if (list.length === 0) {
458 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false 484 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false
@@ -92,14 +92,14 @@ @@ -92,14 +92,14 @@
92 </uni-list-item> 92 </uni-list-item>
93 <uni-list-item title="厚度公差上限(mm)"> 93 <uni-list-item title="厚度公差上限(mm)">
94 <template v-slot:footer> 94 <template v-slot:footer>
95 - <uni-easyinput type="digit" v-model="item.thicknessTolPos" :inputBorder="false"  
96 - placeholder="请输入厚度公差上限" @input="onNonNegativeInput(idx, 'thicknessTolPos')" @blur="onNonNegativeBlur(idx, 'thicknessTolPos', 2)" /> 95 + <uni-easyinput type="text" v-model="item.thicknessTolPos" :inputBorder="false"
  96 + placeholder="请输入厚度公差上限" @input="onNumberInput(idx, 'thicknessTolPos')" @blur="onNumberBlur(idx, 'thicknessTolPos', 2)" />
97 </template> 97 </template>
98 </uni-list-item> 98 </uni-list-item>
99 <uni-list-item title="厚度公差下限(mm)"> 99 <uni-list-item title="厚度公差下限(mm)">
100 <template v-slot:footer> 100 <template v-slot:footer>
101 - <uni-easyinput type="digit" v-model="item.thicknessTolNeg" :inputBorder="false"  
102 - placeholder="请输入厚度公差下限" @input="onNonNegativeInput(idx, 'thicknessTolNeg')" @blur="onNonNegativeBlur(idx, 'thicknessTolNeg', 2)" /> 101 + <uni-easyinput type="text" v-model="item.thicknessTolNeg" :inputBorder="false"
  102 + placeholder="请输入厚度公差下限" @input="onNumberInput(idx, 'thicknessTolNeg')" @blur="onNumberBlur(idx, 'thicknessTolNeg', 2)" />
103 </template> 103 </template>
104 </uni-list-item> 104 </uni-list-item>
105 <uni-list-item title="宽度(mm)"> 105 <uni-list-item title="宽度(mm)">
@@ -109,12 +109,12 @@ @@ -109,12 +109,12 @@
109 </uni-list-item> 109 </uni-list-item>
110 <uni-list-item title="宽度公差上限(mm)"> 110 <uni-list-item title="宽度公差上限(mm)">
111 <template v-slot:footer> 111 <template v-slot:footer>
112 - <uni-easyinput type="digit" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差上限" @input="onNonNegativeInput(idx, 'widthTolPos')" @blur="onNonNegativeBlur(idx, 'widthTolPos', 2)" /> 112 + <uni-easyinput type="text" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差上限" @input="onNumberInput(idx, 'widthTolPos')" @blur="onNumberBlur(idx, 'widthTolPos', 2)" />
113 </template> 113 </template>
114 </uni-list-item> 114 </uni-list-item>
115 <uni-list-item title="宽度公差下限(mm)"> 115 <uni-list-item title="宽度公差下限(mm)">
116 <template v-slot:footer> 116 <template v-slot:footer>
117 - <uni-easyinput type="digit" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差下限" @input="onNonNegativeInput(idx, 'widthTolNeg')" @blur="onNonNegativeBlur(idx, 'widthTolNeg', 2)" /> 117 + <uni-easyinput type="text" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差下限" @input="onNumberInput(idx, 'widthTolNeg')" @blur="onNumberBlur(idx, 'widthTolNeg', 2)" />
118 </template> 118 </template>
119 </uni-list-item> 119 </uni-list-item>
120 <uni-list-item title="长度(mm)"> 120 <uni-list-item title="长度(mm)">
@@ -124,14 +124,14 @@ @@ -124,14 +124,14 @@
124 </uni-list-item> 124 </uni-list-item>
125 <uni-list-item title="长度公差上限(mm)"> 125 <uni-list-item title="长度公差上限(mm)">
126 <template v-slot:footer> 126 <template v-slot:footer>
127 - <uni-easyinput type="digit" v-model="item.lengthTolPos" :inputBorder="false"  
128 - placeholder="请输入长度公差上限" @input="onNonNegativeInput(idx, 'lengthTolPos')" @blur="onNonNegativeBlur(idx, 'lengthTolPos', 2)" /> 127 + <uni-easyinput type="text" v-model="item.lengthTolPos" :inputBorder="false"
  128 + placeholder="请输入长度公差上限" @input="onNumberInput(idx, 'lengthTolPos')" @blur="onNumberBlur(idx, 'lengthTolPos', 2)" />
129 </template> 129 </template>
130 </uni-list-item> 130 </uni-list-item>
131 <uni-list-item title="长度公差下限(mm)"> 131 <uni-list-item title="长度公差下限(mm)">
132 <template v-slot:footer> 132 <template v-slot:footer>
133 - <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false"  
134 - placeholder="请输入长度公差下限" @input="onNonNegativeInput(idx, 'lengthTolNeg')" @blur="onNonNegativeBlur(idx, 'lengthTolNeg', 2)" /> 133 + <uni-easyinput type="text" v-model="item.lengthTolNeg" :inputBorder="false"
  134 + placeholder="请输入长度公差下限" @input="onNumberInput(idx, 'lengthTolNeg')" @blur="onNumberBlur(idx, 'lengthTolNeg', 2)" />
135 </template> 135 </template>
136 </uni-list-item> 136 </uni-list-item>
137 <uni-list-item title="定作物数量"> 137 <uni-list-item title="定作物数量">
@@ -295,6 +295,45 @@ export default { @@ -295,6 +295,45 @@ export default {
295 defaultItem() { 295 defaultItem() {
296 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: '' } 296 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: '' }
297 }, 297 },
  298 + onNumberInput(idx, field) {
  299 + const it = this.items[idx]
  300 + if (!it) return
  301 + let v = String(it[field] != null ? it[field] : '')
  302 + v = v.replace(/[^0-9.-]/g, '')
  303 + if ((v.match(/-/g) || []).length > 1) {
  304 + const first = v.indexOf('-') === 0 ? '-' : ''
  305 + v = first + v.replace(/-/g, '')
  306 + } else if (v.indexOf('-') > 0) {
  307 + v = v.replace(/-/g, '')
  308 + }
  309 + if ((v.match(/\./g) || []).length > 1) {
  310 + const parts = v.split('.')
  311 + v = parts[0] + '.' + parts.slice(1).join('')
  312 + }
  313 + it[field] = v
  314 + this.$set(this.items, idx, it)
  315 + },
  316 + validate() {
  317 + for (let i = 0; i < this.items.length; i++) {
  318 + const it = this.items[i]
  319 + const check = (pos, neg, label) => {
  320 + if (pos !== '' && pos !== null && pos !== undefined &&
  321 + neg !== '' && neg !== null && neg !== undefined) {
  322 + if (Number(pos) <= Number(neg)) {
  323 + return `第${i + 1}行产品：${label}公差上限必须大于下限`
  324 + }
  325 + }
  326 + return null
  327 + }
  328 + let err = check(it.thicknessTolPos, it.thicknessTolNeg, '厚度')
  329 + if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
  330 + err = check(it.widthTolPos, it.widthTolNeg, '宽度')
  331 + if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
  332 + err = check(it.lengthTolPos, it.lengthTolNeg, '长度')
  333 + if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
  334 + }
  335 + return true
  336 + },
298 onNonNegativeInput(idx, field) { 337 onNonNegativeInput(idx, field) {
299 const it = this.items[idx] 338 const it = this.items[idx]
300 if (!it) return 339 if (!it) return
@@ -21,6 +21,13 @@ @@ -21,6 +21,13 @@
21 <view class="item-title"><text class="required">*</text><text>需方</text></view> 21 <view class="item-title"><text class="required">*</text><text>需方</text></view>
22 </template> 22 </template>
23 </uni-list-item> 23 </uni-list-item>
  24 + <uni-list-item class="select-item" :class="form.stockUpCompanyId ? 'is-filled' : 'is-empty'" clickable
  25 + @click="openRelate('stockUpCompanyId')" :rightText="form.stockUpCompanyName || '请选择备货单位'" showArrow>
  26 + <template v-slot:body>
  27 + <view class="item-title"><text class="required">*</text><text>备货单位/人（生产标准）</text></view>
  28 + </template>
  29 + </uni-list-item>
  30 +
24 31
25 <uni-list-item title="订货日期"> 32 <uni-list-item title="订货日期">
26 <template v-slot:footer> 33 <template v-slot:footer>
@@ -39,7 +46,18 @@ @@ -39,7 +46,18 @@
39 <view class="item-title"><text class="required">*</text><text>生产厂</text></view> 46 <view class="item-title"><text class="required">*</text><text>生产厂</text></view>
40 </template> 47 </template>
41 </uni-list-item> 48 </uni-list-item>
42 - <ProductRel mode="add" :deliveryDateBase="form.deliveryDate" :deliveryDate="form.orderDate" @change="onProductsChange" :options="productList" /> 49 + <uni-list-item title="办事处">
  50 + <template v-slot:footer>
  51 + <uni-easyinput v-model="form.deptName" :inputBorder="false" disabled placeholder="自动获取" />
  52 + </template>
  53 + </uni-list-item>
  54 + <uni-list-item class="select-item" :class="form.region ? 'is-filled' : 'is-empty'" clickable
  55 + @click="openSheet('region')" :rightText="displayLabel('regionName')" showArrow>
  56 + <template v-slot:body>
  57 + <view class="item-title"><text class="required">*</text><text>区域</text></view>
  58 + </template>
  59 + </uni-list-item>
  60 + <ProductRel ref="productRel" mode="add" :deliveryDateBase="form.deliveryDate" :deliveryDate="form.orderDate" :list="productLineList" @change="onProductsChange" :options="productList" />
43 <uni-list-item title="合计人民币金额（大写）"> 61 <uni-list-item title="合计人民币金额（大写）">
44 <template v-slot:footer> 62 <template v-slot:footer>
45 <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false" disabled /> 63 <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false" disabled />
@@ -208,10 +226,11 @@ import SingleSelectSheet from '@/components/single-select/index.vue' @@ -208,10 +226,11 @@ import SingleSelectSheet from '@/components/single-select/index.vue'
208 import RelateSelectSheet from '@/components/relate-select/index.vue' 226 import RelateSelectSheet from '@/components/relate-select/index.vue'
209 import ProductRel from './productRel.vue' 227 import ProductRel from './productRel.vue'
210 import CitySelector from '@/components/city-selector/index.vue' 228 import CitySelector from '@/components/city-selector/index.vue'
211 -import { getRetailCodeApi, createContractApi, getCustomerRemarks,getCustomerSpecificQualityRequirements } from '@/api/contract' 229 +import { getRetailCodeApi, createContractApi, getCustomerRemarks,getCustomerSpecificQualityRequirements, getDeptApi } from '@/api/contract'
212 import { getDicByCodes } from '@/utils/dic' 230 import { getDicByCodes } from '@/utils/dic'
213 import { formatCurrencyToChinese } from '@/utils/common' 231 import { formatCurrencyToChinese } from '@/utils/common'
214 import { workshopQueryApi } from '@/api/devManage' 232 import { workshopQueryApi } from '@/api/devManage'
  233 +import { getArea } from '@/api/credit_manage.js'
215 234
216 export default { 235 export default {
217 name: 'AddContractRetail', 236 name: 'AddContractRetail',
@@ -224,6 +243,8 @@ export default { @@ -224,6 +243,8 @@ export default {
224 supplierName: '', 243 supplierName: '',
225 buyer: '', 244 buyer: '',
226 buyerName: '', 245 buyerName: '',
  246 + stockUpCompanyId: '',
  247 + stockUpCompanyName: '',
227 orderDate: '', 248 orderDate: '',
228 deliveryDate: '', 249 deliveryDate: '',
229 designatedConsignee: '', 250 designatedConsignee: '',
@@ -242,6 +263,10 @@ export default { @@ -242,6 +263,10 @@ export default {
242 destinationLabel: '', 263 destinationLabel: '',
243 workshopIdName: '', 264 workshopIdName: '',
244 workshopId: '', 265 workshopId: '',
  266 + deptName: '',
  267 + deptId: '',
  268 + region: '',
  269 + regionName: '',
245 remarks: '', 270 remarks: '',
246 component: '', 271 component: '',
247 packaging: '', 272 packaging: '',
@@ -263,12 +288,15 @@ export default { @@ -263,12 +288,15 @@ export default {
263 productList: [], 288 productList: [],
264 customerRemarks: [], 289 customerRemarks: [],
265 defaultRemark: '', 290 defaultRemark: '',
  291 + regionOptions: [],
266 } 292 }
267 }, 293 },
268 created() { 294 created() {
269 this.loadSuppliers() 295 this.loadSuppliers()
270 this.loadExtraOptions() 296 this.loadExtraOptions()
271 this.initCode() 297 this.initCode()
  298 + this.getDept()
  299 + this.loadRegionOptions()
272 this.form.orderDate = this.formatDate(new Date()) 300 this.form.orderDate = this.formatDate(new Date())
273 this.$nextTick(() => { 301 this.$nextTick(() => {
274 if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) { 302 if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
@@ -318,6 +346,24 @@ export default { @@ -318,6 +346,24 @@ export default {
318 }, 346 },
319 }, 347 },
320 methods: { 348 methods: {
  349 + async loadRegionOptions() {
  350 + try {
  351 + const res = await getArea()
  352 + const list = res.data || []
  353 + this.regionOptions = (list || []).map(it => ({ label: it.name || '', value: it.id || '' }))
  354 + } catch (e) {
  355 + this.regionOptions = []
  356 + }
  357 + },
  358 + // 查询当前人所在办事处
  359 + getDept() {
  360 + getDeptApi().then(res => {
  361 + if (res.code === 200) {
  362 + this.form.deptName = res.data.name || ''
  363 + this.form.deptId = res.data.id || ''
  364 + }
  365 + })
  366 + },
321 getHistory() { 367 getHistory() {
322 console.log('this.productLineList', this.productLineList[0].productId) 368 console.log('this.productLineList', this.productLineList[0].productId)
323 if (!this.productLineList.length || !this.productLineList[0].productId) { 369 if (!this.productLineList.length || !this.productLineList[0].productId) {
@@ -405,7 +451,7 @@ export default { @@ -405,7 +451,7 @@ export default {
405 }, 451 },
406 displayLabel(field) { 452 displayLabel(field) {
407 const m = this.form 453 const m = this.form
408 - const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopIdName: '请选择生产厂' } 454 + const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopIdName: '请选择生产厂', regionName: '请选择区域' }
409 const val = m[field] 455 const val = m[field]
410 return val ? String(val) : map[field] 456 return val ? String(val) : map[field]
411 }, 457 },
@@ -450,6 +496,8 @@ export default { @@ -450,6 +496,8 @@ export default {
450 setSheet('单价中是否已包含运费', this.yesNoList) 496 setSheet('单价中是否已包含运费', this.yesNoList)
451 } else if (field === 'historyRemarks') { 497 } else if (field === 'historyRemarks') {
452 setSheet('历史备注', this.customerRemarks) 498 setSheet('历史备注', this.customerRemarks)
  499 + }else if (field === 'region') {
  500 + setSheet('区域', this.regionOptions)
453 } 501 }
454 }, 502 },
455 onSheetConfirm({ value, label }) { 503 onSheetConfirm({ value, label }) {
@@ -468,6 +516,8 @@ export default { @@ -468,6 +516,8 @@ export default {
468 let config = {} 516 let config = {}
469 if (fieldKey === 'buyer') { 517 if (fieldKey === 'buyer') {
470 config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] } 518 config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
  519 + } else if (fieldKey === 'stockUpCompanyId') {
  520 + config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
471 } 521 }
472 const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : [] 522 const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
473 this.sheet.visible = false 523 this.sheet.visible = false
@@ -478,7 +528,17 @@ export default { @@ -478,7 +528,17 @@ export default {
478 const _fieldKey = this.relate.fieldKey 528 const _fieldKey = this.relate.fieldKey
479 const first = (items && items.length > 0) ? items[0] : null 529 const first = (items && items.length > 0) ? items[0] : null
480 this.form[_fieldKey] = (first && first.id) ? first.id : '' 530 this.form[_fieldKey] = (first && first.id) ? first.id : ''
481 - this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : '' 531 +
  532 + if (_fieldKey === 'stockUpCompanyId') {
  533 + this.form.stockUpCompanyName = (first && first.name) ? first.name : ''
  534 + } else {
  535 + this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : ''
  536 + }
  537 +
  538 + if (_fieldKey === 'buyer') {
  539 + this.form.stockUpCompanyId = (first && first.id) ? first.id : ''
  540 + this.form.stockUpCompanyName = (first && first.name) ? first.name : ''
  541 + }
482 }, 542 },
483 onRadioSelect(field, nameField, opt) { 543 onRadioSelect(field, nameField, opt) {
484 const val = opt && opt.value != null ? opt.value : '' 544 const val = opt && opt.value != null ? opt.value : ''
@@ -534,9 +594,11 @@ export default { @@ -534,9 +594,11 @@ export default {
534 { key: 'code', label: '编号' }, 594 { key: 'code', label: '编号' },
535 { key: 'supplier', label: '供方' }, 595 { key: 'supplier', label: '供方' },
536 { key: 'buyer', label: '需方' }, 596 { key: 'buyer', label: '需方' },
  597 + { key: 'stockUpCompanyId', label: '备货单位/人（生产标准）' },
537 { key: 'orderDate', label: '订货日期' }, 598 { key: 'orderDate', label: '订货日期' },
538 { key: 'unit', label: '单位' }, 599 { key: 'unit', label: '单位' },
539 { key: 'workshopId', label: '生产厂' }, 600 { key: 'workshopId', label: '生产厂' },
  601 + { key: 'region', label: '区域' },
540 { key: 'specialTerms', label: '特别条款要求' }, 602 { key: 'specialTerms', label: '特别条款要求' },
541 ] 603 ]
542 for (const it of checks) { 604 for (const it of checks) {
@@ -544,6 +606,7 @@ export default { @@ -544,6 +606,7 @@ export default {
544 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val))) 606 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
545 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false } 607 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
546 } 608 }
  609 + if (this.$refs.productRel && !this.$refs.productRel.validate()) return false
547 const list = Array.isArray(this.productLineList) ? this.productLineList : [] 610 const list = Array.isArray(this.productLineList) ? this.productLineList : []
548 if (list.length === 0) { 611 if (list.length === 0) {
549 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false 612 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false
@@ -9,11 +9,17 @@ @@ -9,11 +9,17 @@
9 '-'}}</text></view> 9 '-'}}</text></view>
10 <view class="row"><text class="label">需方</text><text class="value">{{ detail.buyerName || 10 <view class="row"><text class="label">需方</text><text class="value">{{ detail.buyerName ||
11 '-'}}</text></view> 11 '-'}}</text></view>
  12 + <view class="row"><text class="label">备货单位/人（生产标准）</text><text class="value">{{ detail.stockUpCompanyName || '-'
  13 + }}</text></view>
12 <view class="row"><text class="label">订货日期</text><text class="value">{{ detail.orderDate }}</text> 14 <view class="row"><text class="label">订货日期</text><text class="value">{{ detail.orderDate }}</text>
13 </view> 15 </view>
14 <view class="row"><text class="label">单位</text><text class="value">{{ detail.unit }}</text></view> 16 <view class="row"><text class="label">单位</text><text class="value">{{ detail.unit }}</text></view>
15 <view class="row"><text class="label">生产厂</text><text class="value">{{ detail.workshopName || 17 <view class="row"><text class="label">生产厂</text><text class="value">{{ detail.workshopName ||
16 '-'}}</text></view> 18 '-'}}</text></view>
  19 + <view class="row"><text class="label">办事处</text><text class="value">{{ detail.deptName || '-'
  20 + }}</text></view>
  21 + <view class="row"><text class="label">区域</text><text class="value">{{ detail.regionName || '-'
  22 + }}</text></view>
17 </view> 23 </view>
18 24
19 <view class="section1"> 25 <view class="section1">
@@ -154,7 +160,11 @@ export default { @@ -154,7 +160,11 @@ export default {
154 tolerance: '', 160 tolerance: '',
155 performance: '', 161 performance: '',
156 component: '', 162 component: '',
157 - packaging: '' 163 + packaging: '',
  164 + stockUpCompanyId: '',
  165 + stockUpCompanyName: '',
  166 + region: '',
  167 + regionName: '',
158 }, 168 },
159 productList: [], 169 productList: [],
160 fileInfo: { id: '', name: '' }, 170 fileInfo: { id: '', name: '' },
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 <view class="item-title"><text class="required">*</text><text>需方</text></view> 21 <view class="item-title"><text class="required">*</text><text>需方</text></view>
22 </template> 22 </template>
23 </uni-list-item> 23 </uni-list-item>
24 - 24 +
25 <uni-list-item class="select-item" :class="form.workshopId ? 'is-filled' : 'is-empty'" clickable 25 <uni-list-item class="select-item" :class="form.workshopId ? 'is-filled' : 'is-empty'" clickable
26 @click="openSheet('workshopId')" :rightText="form.workshopName || '请选择生产厂'" showArrow> 26 @click="openSheet('workshopId')" :rightText="form.workshopName || '请选择生产厂'" showArrow>
27 <template v-slot:body> 27 <template v-slot:body>
@@ -40,8 +40,23 @@ @@ -40,8 +40,23 @@
40 <uni-easyinput v-model="form.unit" :inputBorder="false" disabled /> 40 <uni-easyinput v-model="form.unit" :inputBorder="false" disabled />
41 </template> 41 </template>
42 </uni-list-item> 42 </uni-list-item>
43 -  
44 - <ProductRel mode="add" :deliveryDateBase="form.deliveryDate" :deliveryDate="form.orderDate" :list="productLineList" @change="onProductsChange" :options="productList" /> 43 + <uni-list-item class="select-item" :class="form.deptName ? 'is-filled' : 'is-empty'">
  44 + <template v-slot:body>
  45 + <view class="item-title"><text class="required">*</text><text>办事处</text></view>
  46 + </template>
  47 + <template v-slot:footer>
  48 + <view class="serial-number-row">
  49 + <uni-easyinput v-model="form.deptName" :inputBorder="false" disabled />
  50 + </view>
  51 + </template>
  52 + </uni-list-item>
  53 + <uni-list-item class="select-item" :class="form.region ? 'is-filled' : 'is-empty'" clickable
  54 + @click="openSheet('region')" :rightText="displayLabel('regionName')" showArrow>
  55 + <template v-slot:body>
  56 + <view class="item-title"><text class="required">*</text><text>区域</text></view>
  57 + </template>
  58 + </uni-list-item>
  59 + <ProductRel ref="productRel" mode="add" :deliveryDateBase="form.deliveryDate" :deliveryDate="form.orderDate" :list="productLineList" @change="onProductsChange" :options="productList" />
45 60
46 <uni-list-item title="合计人民币金额（大写）"> 61 <uni-list-item title="合计人民币金额（大写）">
47 <template v-slot:footer> 62 <template v-slot:footer>
@@ -199,6 +214,8 @@ import { getContractApi, updateContractApi } from '@/api/contract' @@ -199,6 +214,8 @@ import { getContractApi, updateContractApi } from '@/api/contract'
199 import { getDicByCodes } from '@/utils/dic' 214 import { getDicByCodes } from '@/utils/dic'
200 import { formatCurrencyToChinese } from '@/utils/common' 215 import { formatCurrencyToChinese } from '@/utils/common'
201 import { workshopQueryApi } from '@/api/devManage' 216 import { workshopQueryApi } from '@/api/devManage'
  217 +import { getArea } from '@/api/credit_manage.js'
  218 +
202 export default { 219 export default {
203 name: 'ModifyContractRetail', 220 name: 'ModifyContractRetail',
204 components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector }, 221 components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector },
@@ -212,6 +229,12 @@ export default { @@ -212,6 +229,12 @@ export default {
212 supplierName: '', 229 supplierName: '',
213 buyer: '', 230 buyer: '',
214 buyerName: '', 231 buyerName: '',
  232 + stockUpCompanyId: '',
  233 + stockUpCompanyName: '',
  234 + region: '',
  235 + regionName: '',
  236 + deptName: '',
  237 + deptId: '',
215 workshopId: '', 238 workshopId: '',
216 workshopName: '', 239 workshopName: '',
217 orderDate: '', 240 orderDate: '',
@@ -254,7 +277,8 @@ export default { @@ -254,7 +277,8 @@ export default {
254 totalAmountIncludingTax: 0, 277 totalAmountIncludingTax: 0,
255 productLineList: [], 278 productLineList: [],
256 newProductLineList: [], 279 newProductLineList: [],
257 - productList: [] 280 + productList: [],
  281 + regionOptions: []
258 } 282 }
259 }, 283 },
260 onLoad(query) { 284 onLoad(query) {
@@ -263,6 +287,7 @@ export default { @@ -263,6 +287,7 @@ export default {
263 created() { 287 created() {
264 this.loadSuppliers() 288 this.loadSuppliers()
265 this.loadExtraOptions() 289 this.loadExtraOptions()
  290 + this.loadRegionOptions()
266 this.loadDetail() 291 this.loadDetail()
267 this.$nextTick(() => { 292 this.$nextTick(() => {
268 if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) { 293 if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
@@ -271,6 +296,15 @@ export default { @@ -271,6 +296,15 @@ export default {
271 }) 296 })
272 }, 297 },
273 methods: { 298 methods: {
  299 + async loadRegionOptions() {
  300 + try {
  301 + const res = await getArea()
  302 + const list = res.data || []
  303 + this.regionOptions = (list || []).map(it => ({ label: it.name || '', value: it.id || '' }))
  304 + } catch (e) {
  305 + this.regionOptions = []
  306 + }
  307 + },
274 async loadDetail() { 308 async loadDetail() {
275 if (!this.id) return 309 if (!this.id) return
276 try { 310 try {
@@ -316,6 +350,12 @@ export default { @@ -316,6 +350,12 @@ export default {
316 packaging: m.packaging || '', 350 packaging: m.packaging || '',
317 workshopId: m.workshopId || '', 351 workshopId: m.workshopId || '',
318 workshopName: m.workshopName || '', 352 workshopName: m.workshopName || '',
  353 + stockUpCompanyId: m.stockUpCompanyId || '',
  354 + stockUpCompanyName: m.stockUpCompanyName || '',
  355 + region: m.region || '',
  356 + regionName: m.regionName || '',
  357 + deptName: m.deptName || '',
  358 + deptId: m.deptId || '',
319 } 359 }
320 const lines = Array.isArray(m.contractDistributorLineList) ? m.contractDistributorLineList : [] 360 const lines = Array.isArray(m.contractDistributorLineList) ? m.contractDistributorLineList : []
321 this.productLineList = lines 361 this.productLineList = lines
@@ -371,7 +411,7 @@ export default { @@ -371,7 +411,7 @@ export default {
371 }, 411 },
372 displayLabel(field) { 412 displayLabel(field) {
373 const m = this.form 413 const m = this.form
374 - const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopName: '请选择生产厂' } 414 + const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopName: '请选择生产厂', regionName: '请选择区域' }
375 const val = m[field] 415 const val = m[field]
376 return val ? String(val) : map[field] 416 return val ? String(val) : map[field]
377 }, 417 },
@@ -400,6 +440,8 @@ export default { @@ -400,6 +440,8 @@ export default {
400 setSheet('单价中是否已包含包装费', this.yesNoList) 440 setSheet('单价中是否已包含包装费', this.yesNoList)
401 } else if (field === 'includesTransportFee') { 441 } else if (field === 'includesTransportFee') {
402 setSheet('单价中是否已包含运费', this.yesNoList) 442 setSheet('单价中是否已包含运费', this.yesNoList)
  443 + } else if (field === 'region') {
  444 + setSheet('区域', this.regionOptions)
403 } 445 }
404 }, 446 },
405 onSheetConfirm({ value, label }) { 447 onSheetConfirm({ value, label }) {
@@ -413,6 +455,8 @@ export default { @@ -413,6 +455,8 @@ export default {
413 let config = {} 455 let config = {}
414 if (fieldKey === 'buyer') { 456 if (fieldKey === 'buyer') {
415 config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] } 457 config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
  458 + } else if (fieldKey === 'stockUpCompanyId') {
  459 + config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
416 } 460 }
417 const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : [] 461 const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
418 this.sheet.visible = false 462 this.sheet.visible = false
@@ -423,7 +467,11 @@ export default { @@ -423,7 +467,11 @@ export default {
423 const _fieldKey = this.relate.fieldKey 467 const _fieldKey = this.relate.fieldKey
424 const first = (items && items.length > 0) ? items[0] : null 468 const first = (items && items.length > 0) ? items[0] : null
425 this.form[_fieldKey] = (first && first.id) ? first.id : '' 469 this.form[_fieldKey] = (first && first.id) ? first.id : ''
426 - this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : '' 470 + if (_fieldKey === 'stockUpCompanyId') {
  471 + this.form.stockUpCompanyName = (first && first.name) ? first.name : ''
  472 + } else {
  473 + this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : ''
  474 + }this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : ''
427 }, 475 },
428 onRadioSelect(field, nameField, opt) { 476 onRadioSelect(field, nameField, opt) {
429 const val = opt && opt.value != null ? opt.value : '' 477 const val = opt && opt.value != null ? opt.value : ''
@@ -443,12 +491,15 @@ export default { @@ -443,12 +491,15 @@ export default {
443 { key: 'unit', label: '单位' }, 491 { key: 'unit', label: '单位' },
444 { key: 'workshopId', label: '生产厂' }, 492 { key: 'workshopId', label: '生产厂' },
445 { key: 'specialTerms', label: '特别条款要求' }, 493 { key: 'specialTerms', label: '特别条款要求' },
  494 + { key: 'stockUpCompanyId', label: '备货单位/人（生产标准）' },
  495 + { key: 'region', label: '区域' },
446 ] 496 ]
447 for (const it of checks) { 497 for (const it of checks) {
448 const val = this.form[it.key] 498 const val = this.form[it.key]
449 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val))) 499 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
450 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false } 500 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
451 } 501 }
  502 + if (this.$refs.productRel && !this.$refs.productRel.validate()) return false
452 const list = Array.isArray(this.newProductLineList) ? this.newProductLineList : [] 503 const list = Array.isArray(this.newProductLineList) ? this.newProductLineList : []
453 if (list.length === 0) { 504 if (list.length === 0) {
454 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false 505 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false
@@ -60,14 +60,14 @@ @@ -60,14 +60,14 @@
60 </uni-list-item> 60 </uni-list-item>
61 <uni-list-item title="厚度公差上限(mm)"> 61 <uni-list-item title="厚度公差上限(mm)">
62 <template v-slot:footer> 62 <template v-slot:footer>
63 - <uni-easyinput type="digit" v-model="item.thicknessTolPos" :inputBorder="false"  
64 - placeholder="请输入厚度公差上限" @input="onNonNegativeInput(idx, 'thicknessTolPos')" @blur="onNonNegativeBlur(idx, 'thicknessTolPos', 2)" /> 63 + <uni-easyinput type="text" v-model="item.thicknessTolPos" :inputBorder="false"
  64 + placeholder="请输入厚度公差上限" @input="onNumberInput(idx, 'thicknessTolPos')" @blur="onNumberBlur(idx, 'thicknessTolPos', 2)" />
65 </template> 65 </template>
66 </uni-list-item> 66 </uni-list-item>
67 <uni-list-item title="厚度公差下限(mm)"> 67 <uni-list-item title="厚度公差下限(mm)">
68 <template v-slot:footer> 68 <template v-slot:footer>
69 - <uni-easyinput type="digit" v-model="item.thicknessTolNeg" :inputBorder="false"  
70 - placeholder="请输入厚度公差下限" @input="onNonNegativeInput(idx, 'thicknessTolNeg')" @blur="onNonNegativeBlur(idx, 'thicknessTolNeg', 2)" /> 69 + <uni-easyinput type="text" v-model="item.thicknessTolNeg" :inputBorder="false"
  70 + placeholder="请输入厚度公差下限" @input="onNumberInput(idx, 'thicknessTolNeg')" @blur="onNumberBlur(idx, 'thicknessTolNeg', 2)" />
71 </template> 71 </template>
72 </uni-list-item> 72 </uni-list-item>
73 <uni-list-item title="宽度(mm)"> 73 <uni-list-item title="宽度(mm)">
@@ -77,12 +77,12 @@ @@ -77,12 +77,12 @@
77 </uni-list-item> 77 </uni-list-item>
78 <uni-list-item title="宽度公差上限(mm)"> 78 <uni-list-item title="宽度公差上限(mm)">
79 <template v-slot:footer> 79 <template v-slot:footer>
80 - <uni-easyinput type="digit" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差上限" @input="onNonNegativeInput(idx, 'widthTolPos')" @blur="onNonNegativeBlur(idx, 'widthTolPos', 2)" /> 80 + <uni-easyinput type="text" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差上限" @input="onNumberInput(idx, 'widthTolPos')" @blur="onNumberBlur(idx, 'widthTolPos', 2)" />
81 </template> 81 </template>
82 </uni-list-item> 82 </uni-list-item>
83 <uni-list-item title="宽度公差下限(mm)"> 83 <uni-list-item title="宽度公差下限(mm)">
84 <template v-slot:footer> 84 <template v-slot:footer>
85 - <uni-easyinput type="digit" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差下限" @input="onNonNegativeInput(idx, 'widthTolNeg')" @blur="onNonNegativeBlur(idx, 'widthTolNeg', 2)" /> 85 + <uni-easyinput type="text" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差下限" @input="onNumberInput(idx, 'widthTolNeg')" @blur="onNumberBlur(idx, 'widthTolNeg', 2)" />
86 </template> 86 </template>
87 </uni-list-item> 87 </uni-list-item>
88 <uni-list-item title="长度(mm)"> 88 <uni-list-item title="长度(mm)">
@@ -92,14 +92,14 @@ @@ -92,14 +92,14 @@
92 </uni-list-item> 92 </uni-list-item>
93 <uni-list-item title="长度公差上限(mm)"> 93 <uni-list-item title="长度公差上限(mm)">
94 <template v-slot:footer> 94 <template v-slot:footer>
95 - <uni-easyinput type="digit" v-model="item.lengthTolPos" :inputBorder="false"  
96 - placeholder="请输入长度公差上限" @input="onNonNegativeInput(idx, 'lengthTolPos')" @blur="onNonNegativeBlur(idx, 'lengthTolPos', 2)" /> 95 + <uni-easyinput type="text" v-model="item.lengthTolPos" :inputBorder="false"
  96 + placeholder="请输入长度公差上限" @input="onNumberInput(idx, 'lengthTolPos')" @blur="onNumberBlur(idx, 'lengthTolPos', 2)" />
97 </template> 97 </template>
98 </uni-list-item> 98 </uni-list-item>
99 <uni-list-item title="长度公差下限(mm)"> 99 <uni-list-item title="长度公差下限(mm)">
100 <template v-slot:footer> 100 <template v-slot:footer>
101 - <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false"  
102 - placeholder="请输入长度公差下限" @input="onNonNegativeInput(idx, 'lengthTolNeg')" @blur="onNonNegativeBlur(idx, 'lengthTolNeg', 2)" /> 101 + <uni-easyinput type="text" v-model="item.lengthTolNeg" :inputBorder="false"
  102 + placeholder="请输入长度公差下限" @input="onNumberInput(idx, 'lengthTolNeg')" @blur="onNumberBlur(idx, 'lengthTolNeg', 2)" />
103 </template> 103 </template>
104 </uni-list-item> 104 </uni-list-item>
105 <uni-list-item title="状态"> 105 <uni-list-item title="状态">
@@ -259,6 +259,61 @@ export default { @@ -259,6 +259,61 @@ export default {
259 defaultItem() { 259 defaultItem() {
260 return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '' } 260 return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '' }
261 }, 261 },
  262 + onNumberInput(idx, field) {
  263 + const it = this.items[idx]
  264 + if (!it) return
  265 + let v = String(it[field] != null ? it[field] : '')
  266 + v = v.replace(/[^0-9.-]/g, '')
  267 + if ((v.match(/-/g) || []).length > 1) {
  268 + const first = v.indexOf('-') === 0 ? '-' : ''
  269 + v = first + v.replace(/-/g, '')
  270 + } else if (v.indexOf('-') > 0) {
  271 + v = v.replace(/-/g, '')
  272 + }
  273 + if ((v.match(/\./g) || []).length > 1) {
  274 + const parts = v.split('.')
  275 + v = parts[0] + '.' + parts.slice(1).join('')
  276 + }
  277 + it[field] = v
  278 + this.$set(this.items, idx, it)
  279 + },
  280 + onNumberBlur(idx, field, digits) {
  281 + const it = this.items[idx]
  282 + if (!it) return
  283 + let raw = it[field]
  284 + if (raw === '' || raw === null || raw === undefined || raw === '-') {
  285 + if (raw === '-') it[field] = ''
  286 + this.$set(this.items, idx, it)
  287 + return
  288 + }
  289 + let val = parseFloat(raw)
  290 + if (isNaN(val)) val = 0
  291 + const m = Math.pow(10, digits)
  292 + const rounded = Math.round(val * m) / m
  293 + it[field] = rounded
  294 + this.$set(this.items, idx, it)
  295 + },
  296 + validate() {
  297 + for (let i = 0; i < this.items.length; i++) {
  298 + const it = this.items[i]
  299 + const check = (pos, neg, label) => {
  300 + if (pos !== '' && pos !== null && pos !== undefined &&
  301 + neg !== '' && neg !== null && neg !== undefined) {
  302 + if (Number(pos) <= Number(neg)) {
  303 + return `第${i + 1}行产品：${label}公差上限必须大于下限`
  304 + }
  305 + }
  306 + return null
  307 + }
  308 + let err = check(it.thicknessTolPos, it.thicknessTolNeg, '厚度')
  309 + if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
  310 + err = check(it.widthTolPos, it.widthTolNeg, '宽度')
  311 + if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
  312 + err = check(it.lengthTolPos, it.lengthTolNeg, '长度')
  313 + if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
  314 + }
  315 + return true
  316 + },
262 onNonNegativeInput(idx, field) { 317 onNonNegativeInput(idx, field) {
263 const it = this.items[idx] 318 const it = this.items[idx]
264 if (!it) return 319 if (!it) return
@@ -21,7 +21,12 @@ @@ -21,7 +21,12 @@
21 <view class="item-title"><text class="required">*</text><text>需方</text></view> 21 <view class="item-title"><text class="required">*</text><text>需方</text></view>
22 </template> 22 </template>
23 </uni-list-item> 23 </uni-list-item>
24 - 24 + <uni-list-item class="select-item" :class="form.stockUpCompanyId ? 'is-filled' : 'is-empty'" clickable
  25 + @click="openRelate('stockUpCompanyId')" :rightText="form.stockUpCompanyName || '请选择备货单位'" showArrow>
  26 + <template v-slot:body>
  27 + <view class="item-title"><text class="required">*</text><text>备货单位/人（生产标准）</text></view>
  28 + </template>
  29 + </uni-list-item>
25 <uni-list-item title="订货日期"> 30 <uni-list-item title="订货日期">
26 <template v-slot:footer> 31 <template v-slot:footer>
27 <uni-datetime-picker type="date" v-model="form.orderDate" /> 32 <uni-datetime-picker type="date" v-model="form.orderDate" />
@@ -39,7 +44,18 @@ @@ -39,7 +44,18 @@
39 <view class="item-title"><text class="required">*</text><text>生产厂</text></view> 44 <view class="item-title"><text class="required">*</text><text>生产厂</text></view>
40 </template> 45 </template>
41 </uni-list-item> 46 </uni-list-item>
42 - <ProductRel mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" @change="onProductsChange" :options="productList" /> 47 + <uni-list-item title="办事处">
  48 + <template v-slot:footer>
  49 + <uni-easyinput v-model="form.deptName" :inputBorder="false" disabled placeholder="自动获取" />
  50 + </template>
  51 + </uni-list-item>
  52 + <uni-list-item class="select-item" :class="form.region ? 'is-filled' : 'is-empty'" clickable
  53 + @click="openSheet('region')" :rightText="displayLabel('regionName')" showArrow>
  54 + <template v-slot:body>
  55 + <view class="item-title"><text class="required">*</text><text>区域</text></view>
  56 + </template>
  57 + </uni-list-item>
  58 + <ProductRel ref="productRel" mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" @change="onProductsChange" :options="productList" />
43 <uni-list-item title="合计人民币金额（大写）"> 59 <uni-list-item title="合计人民币金额（大写）">
44 <template v-slot:footer> 60 <template v-slot:footer>
45 <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false" disabled /> 61 <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false" disabled />
@@ -208,10 +224,11 @@ import SingleSelectSheet from '@/components/single-select/index.vue' @@ -208,10 +224,11 @@ import SingleSelectSheet from '@/components/single-select/index.vue'
208 import RelateSelectSheet from '@/components/relate-select/index.vue' 224 import RelateSelectSheet from '@/components/relate-select/index.vue'
209 import ProductRel from './productRel.vue' 225 import ProductRel from './productRel.vue'
210 import CitySelector from '@/components/city-selector/index.vue' 226 import CitySelector from '@/components/city-selector/index.vue'
211 -import { getRetailCodeApi, createContractApi,getCustomerRemarks,getCustomerSpecificQualityRequirements } from '@/api/contract' 227 +import { getRetailCodeApi, createContractApi,getCustomerRemarks,getCustomerSpecificQualityRequirements, getDeptApi } from '@/api/contract'
212 import { getDicByCodes } from '@/utils/dic' 228 import { getDicByCodes } from '@/utils/dic'
213 import { formatCurrencyToChinese } from '@/utils/common' 229 import { formatCurrencyToChinese } from '@/utils/common'
214 import { workshopQueryApi } from '@/api/devManage' 230 import { workshopQueryApi } from '@/api/devManage'
  231 +import { getArea } from '@/api/credit_manage.js'
215 232
216 export default { 233 export default {
217 name: 'AddContractStock', 234 name: 'AddContractStock',
@@ -224,6 +241,8 @@ export default { @@ -224,6 +241,8 @@ export default {
224 supplierName: '', 241 supplierName: '',
225 buyer: '', 242 buyer: '',
226 buyerName: '', 243 buyerName: '',
  244 + stockUpCompanyId: '',
  245 + stockUpCompanyName: '',
227 orderDate: '', 246 orderDate: '',
228 deliveryDate: '', 247 deliveryDate: '',
229 designatedConsignee: '', 248 designatedConsignee: '',
@@ -242,6 +261,10 @@ export default { @@ -242,6 +261,10 @@ export default {
242 destinationLabel: '', 261 destinationLabel: '',
243 workshopIdName: '', 262 workshopIdName: '',
244 workshopId: '', 263 workshopId: '',
  264 + deptName: '',
  265 + deptId: '',
  266 + region: '',
  267 + regionName: '',
245 remarks: '', 268 remarks: '',
246 component: '', 269 component: '',
247 packaging: '', 270 packaging: '',
@@ -263,12 +286,15 @@ export default { @@ -263,12 +286,15 @@ export default {
263 productList: [], 286 productList: [],
264 customerRemarks: [], 287 customerRemarks: [],
265 defaultRemark: '', 288 defaultRemark: '',
  289 + regionOptions: [],
266 } 290 }
267 }, 291 },
268 created() { 292 created() {
269 this.loadSuppliers() 293 this.loadSuppliers()
270 this.loadExtraOptions() 294 this.loadExtraOptions()
271 this.initCode() 295 this.initCode()
  296 + this.getDept()
  297 + this.loadRegionOptions()
272 this.form.orderDate = this.formatDate(new Date()) 298 this.form.orderDate = this.formatDate(new Date())
273 this.$nextTick(() => { 299 this.$nextTick(() => {
274 if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) { 300 if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
@@ -317,6 +343,24 @@ export default { @@ -317,6 +343,24 @@ export default {
317 }, 343 },
318 }, 344 },
319 methods: { 345 methods: {
  346 + async loadRegionOptions() {
  347 + try {
  348 + const res = await getArea()
  349 + const list = res.data || []
  350 + this.regionOptions = (list || []).map(it => ({ label: it.name || '', value: it.id || '' }))
  351 + } catch (e) {
  352 + this.regionOptions = []
  353 + }
  354 + },
  355 + // 查询当前人所在办事处
  356 + getDept() {
  357 + getDeptApi().then(res => {
  358 + if (res.code === 200) {
  359 + this.form.deptName = res.data.name || ''
  360 + this.form.deptId = res.data.id || ''
  361 + }
  362 + })
  363 + },
320 getHistory() { 364 getHistory() {
321 console.log('this.productLineList', this.productLineList[0].productId) 365 console.log('this.productLineList', this.productLineList[0].productId)
322 if (!this.productLineList.length || !this.productLineList[0].productId) { 366 if (!this.productLineList.length || !this.productLineList[0].productId) {
@@ -404,7 +448,7 @@ export default { @@ -404,7 +448,7 @@ export default {
404 }, 448 },
405 displayLabel(field) { 449 displayLabel(field) {
406 const m = this.form 450 const m = this.form
407 - const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopIdName: '请选择生产厂' } 451 + const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopIdName: '请选择生产厂', regionName: '请选择区域' }
408 const val = m[field] 452 const val = m[field]
409 return val ? String(val) : map[field] 453 return val ? String(val) : map[field]
410 }, 454 },
@@ -449,6 +493,8 @@ export default { @@ -449,6 +493,8 @@ export default {
449 setSheet('单价中是否已包含运费', this.yesNoList) 493 setSheet('单价中是否已包含运费', this.yesNoList)
450 } else if (field === 'historyRemarks') { 494 } else if (field === 'historyRemarks') {
451 setSheet('历史备注', this.customerRemarks) 495 setSheet('历史备注', this.customerRemarks)
  496 + } else if (field === 'region') {
  497 + setSheet('区域', this.regionOptions)
452 } 498 }
453 }, 499 },
454 onSheetConfirm({ value, label }) { 500 onSheetConfirm({ value, label }) {
@@ -467,6 +513,8 @@ export default { @@ -467,6 +513,8 @@ export default {
467 let config = {} 513 let config = {}
468 if (fieldKey === 'buyer') { 514 if (fieldKey === 'buyer') {
469 config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] } 515 config = { title: '需方', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
  516 + } else if (fieldKey === 'stockUpCompanyId') {
  517 + config = { title: '备货单位/人（生产标准）', source: 'customer', rowKey: 'id', multiple: false, display: [{ label: '姓名', field: 'name' }, { label: '编号', field: 'code' }, { label: '状态', field: 'available', format: v => (v ? '启用' : '停用') }] }
470 } 518 }
471 const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : [] 519 const selectedKeys = this.form[fieldKey] ? [this.form[fieldKey]] : []
472 this.sheet.visible = false 520 this.sheet.visible = false
@@ -477,7 +525,17 @@ export default { @@ -477,7 +525,17 @@ export default {
477 const _fieldKey = this.relate.fieldKey 525 const _fieldKey = this.relate.fieldKey
478 const first = (items && items.length > 0) ? items[0] : null 526 const first = (items && items.length > 0) ? items[0] : null
479 this.form[_fieldKey] = (first && first.id) ? first.id : '' 527 this.form[_fieldKey] = (first && first.id) ? first.id : ''
480 - this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : '' 528 +
  529 + if (_fieldKey === 'stockUpCompanyId') {
  530 + this.form.stockUpCompanyName = (first && first.name) ? first.name : ''
  531 + } else {
  532 + this.form[_fieldKey + 'Name'] = (first && first.name) ? first.name : ''
  533 + }
  534 +
  535 + if (_fieldKey === 'buyer') {
  536 + this.form.stockUpCompanyId = (first && first.id) ? first.id : ''
  537 + this.form.stockUpCompanyName = (first && first.name) ? first.name : ''
  538 + }
481 }, 539 },
482 onRadioSelect(field, nameField, opt) { 540 onRadioSelect(field, nameField, opt) {
483 const val = opt && opt.value != null ? opt.value : '' 541 const val = opt && opt.value != null ? opt.value : ''
@@ -543,6 +601,7 @@ export default { @@ -543,6 +601,7 @@ export default {
543 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val))) 601 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
544 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false } 602 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
545 } 603 }
  604 + if (this.$refs.productRel && !this.$refs.productRel.validate()) return false
546 const list = Array.isArray(this.productLineList) ? this.productLineList : [] 605 const list = Array.isArray(this.productLineList) ? this.productLineList : []
547 if (list.length === 0) { 606 if (list.length === 0) {
548 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false 607 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false
@@ -9,11 +9,18 @@ @@ -9,11 +9,18 @@
9 }}</text></view> 9 }}</text></view>
10 <view class="row"><text class="label">需方</text><text class="value">{{ detail.buyerName || '-' 10 <view class="row"><text class="label">需方</text><text class="value">{{ detail.buyerName || '-'
11 }}</text></view> 11 }}</text></view>
  12 + <view class="row"><text class="label">备货单位/人（生产标准）</text><text class="value">{{ detail.stockUpCompanyName || '-'
  13 + }}</text></view>
  14 +
12 <view class="row"><text class="label">订货日期</text><text class="value">{{ detail.orderDate }}</text> 15 <view class="row"><text class="label">订货日期</text><text class="value">{{ detail.orderDate }}</text>
13 </view> 16 </view>
14 <view class="row"><text class="label">单位</text><text class="value">{{ detail.unit }}</text></view> 17 <view class="row"><text class="label">单位</text><text class="value">{{ detail.unit }}</text></view>
15 <view class="row"><text class="label">生产厂</text><text class="value">{{ detail.workshopName || '-' 18 <view class="row"><text class="label">生产厂</text><text class="value">{{ detail.workshopName || '-'
16 - }}</text></view> 19 + }}</text></view>
  20 + <view class="row"><text class="label">办事处</text><text class="value">{{ detail.deptName || '-'
  21 + }}</text></view>
  22 + <view class="row"><text class="label">区域</text><text class="value">{{ detail.regionName || '-'
  23 + }}</text></view>
17 </view> 24 </view>
18 25
19 <view class="section1"> 26 <view class="section1">
@@ -130,6 +137,11 @@ export default { @@ -130,6 +137,11 @@ export default {
130 supplierName: '', 137 supplierName: '',
131 buyer: '', 138 buyer: '',
132 buyerName: '', 139 buyerName: '',
  140 + stockUpCompanyId: '',
  141 + stockUpCompanyName: '',
  142 + deptName: '',
  143 + region: '',
  144 + regionName: '',
133 orderDate: '', 145 orderDate: '',
134 unit: '', 146 unit: '',
135 workshopId: '', 147 workshopId: '',
@@ -22,6 +22,14 @@ @@ -22,6 +22,14 @@
22 </template> 22 </template>
23 </uni-list-item> 23 </uni-list-item>
24 24
  25 + <uni-list-item class="select-item" :class="form.stockUpCompanyId ? 'is-filled' : 'is-empty'" clickable
  26 + @click="openRelate('stockUpCompanyId')" :rightText="form.stockUpCompanyName || '请选择备货单位'" showArrow>
  27 + <template v-slot:body>
  28 + <view class="item-title"><text class="required">*</text><text>备货单位/人（生产标准）</text></view>
  29 + </template>
  30 + </uni-list-item>
  31 +
  32 +
25 <uni-list-item class="select-item" :class="form.workshopId ? 'is-filled' : 'is-empty'" clickable 33 <uni-list-item class="select-item" :class="form.workshopId ? 'is-filled' : 'is-empty'" clickable
26 @click="openSheet('workshopId')" :rightText="form.workshopName || '请选择生产厂'" showArrow> 34 @click="openSheet('workshopId')" :rightText="form.workshopName || '请选择生产厂'" showArrow>
27 <template v-slot:body> 35 <template v-slot:body>
@@ -40,8 +48,18 @@ @@ -40,8 +48,18 @@
40 <uni-easyinput v-model="form.unit" :inputBorder="false" disabled /> 48 <uni-easyinput v-model="form.unit" :inputBorder="false" disabled />
41 </template> 49 </template>
42 </uni-list-item> 50 </uni-list-item>
43 -  
44 - <ProductRel mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" :list="productLineList" @change="onProductsChange" :options="productList" /> 51 + <uni-list-item title="办事处">
  52 + <template v-slot:footer>
  53 + <uni-easyinput v-model="form.deptName" :inputBorder="false" disabled placeholder="自动获取" />
  54 + </template>
  55 + </uni-list-item>
  56 + <uni-list-item class="select-item" :class="form.region ? 'is-filled' : 'is-empty'" clickable
  57 + @click="openSheet('region')" :rightText="displayLabel('regionName')" showArrow>
  58 + <template v-slot:body>
  59 + <view class="item-title"><text class="required">*</text><text>区域</text></view>
  60 + </template>
  61 + </uni-list-item>
  62 + <ProductRel ref="productRel" mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" :list="productLineList" @change="onProductsChange" :options="productList" />
45 63
46 <uni-list-item title="合计人民币金额（大写）"> 64 <uni-list-item title="合计人民币金额（大写）">
47 <template v-slot:footer> 65 <template v-slot:footer>
@@ -195,10 +213,11 @@ import SingleSelectSheet from '@/components/single-select/index.vue' @@ -195,10 +213,11 @@ import SingleSelectSheet from '@/components/single-select/index.vue'
195 import RelateSelectSheet from '@/components/relate-select/index.vue' 213 import RelateSelectSheet from '@/components/relate-select/index.vue'
196 import ProductRel from './productRel.vue' 214 import ProductRel from './productRel.vue'
197 import CitySelector from '@/components/city-selector/index.vue' 215 import CitySelector from '@/components/city-selector/index.vue'
198 -import { getContractApi, updateContractApi } from '@/api/contract' 216 +import { getContractApi, updateContractApi, getDeptApi } from '@/api/contract'
199 import { getDicByCodes } from '@/utils/dic' 217 import { getDicByCodes } from '@/utils/dic'
200 import { formatCurrencyToChinese } from '@/utils/common' 218 import { formatCurrencyToChinese } from '@/utils/common'
201 import { workshopQueryApi } from '@/api/devManage' 219 import { workshopQueryApi } from '@/api/devManage'
  220 +import { getArea } from '@/api/credit_manage.js'
202 export default { 221 export default {
203 name: 'ModifyContractStock', 222 name: 'ModifyContractStock',
204 components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector }, 223 components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector },
@@ -212,8 +231,14 @@ export default { @@ -212,8 +231,14 @@ export default {
212 supplierName: '', 231 supplierName: '',
213 buyer: '', 232 buyer: '',
214 buyerName: '', 233 buyerName: '',
  234 + stockUpCompanyId: '',
  235 + stockUpCompanyName: '',
215 workshopId: '', 236 workshopId: '',
216 workshopName: '', 237 workshopName: '',
  238 + deptName: '',
  239 + deptId: '',
  240 + region: '',
  241 + regionName: '',
217 orderDate: '', 242 orderDate: '',
218 deliveryDate: '', 243 deliveryDate: '',
219 designatedConsignee: '', 244 designatedConsignee: '',
@@ -254,7 +279,8 @@ export default { @@ -254,7 +279,8 @@ export default {
254 totalAmountIncludingTax: 0, 279 totalAmountIncludingTax: 0,
255 productLineList: [], 280 productLineList: [],
256 newProductLineList: [], 281 newProductLineList: [],
257 - productList: [] 282 + productList: [],
  283 + regionOptions: [],
258 } 284 }
259 }, 285 },
260 onLoad(query) { 286 onLoad(query) {
@@ -264,6 +290,7 @@ export default { @@ -264,6 +290,7 @@ export default {
264 this.loadSuppliers() 290 this.loadSuppliers()
265 this.loadExtraOptions() 291 this.loadExtraOptions()
266 this.loadDetail() 292 this.loadDetail()
  293 + this.loadRegionOptions()
267 this.$nextTick(() => { 294 this.$nextTick(() => {
268 if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) { 295 if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
269 this.initDestinationLabel() 296 this.initDestinationLabel()
@@ -271,6 +298,15 @@ export default { @@ -271,6 +298,15 @@ export default {
271 }) 298 })
272 }, 299 },
273 methods: { 300 methods: {
  301 + async loadRegionOptions() {
  302 + try {
  303 + const res = await getArea()
  304 + const list = res.data || []
  305 + this.regionOptions = (list || []).map(it => ({ label: it.name || '', value: it.id || '' }))
  306 + } catch (e) {
  307 + this.regionOptions = []
  308 + }
  309 + },
274 async loadDetail() { 310 async loadDetail() {
275 if (!this.id) return 311 if (!this.id) return
276 try { 312 try {
@@ -287,6 +323,12 @@ export default { @@ -287,6 +323,12 @@ export default {
287 supplierName: m.supplierName || '', 323 supplierName: m.supplierName || '',
288 buyer: m.buyer || (m.customer && m.customer.id) || '', 324 buyer: m.buyer || (m.customer && m.customer.id) || '',
289 buyerName: m.buyerName || (m.customer && m.customer.name) || '', 325 buyerName: m.buyerName || (m.customer && m.customer.name) || '',
  326 + stockUpCompanyId: m.stockUpCompanyId || '',
  327 + stockUpCompanyName: m.stockUpCompanyName || '',
  328 + deptName: m.deptName || '',
  329 + deptId: m.deptId || '',
  330 + region: m.region || '',
  331 + regionName: m.regionName || '',
290 orderDate: m.orderDate || '', 332 orderDate: m.orderDate || '',
291 designatedConsignee: m.designatedConsignee || '', 333 designatedConsignee: m.designatedConsignee || '',
292 specialTerms: m.specialTerms || '', 334 specialTerms: m.specialTerms || '',
@@ -371,7 +413,7 @@ export default { @@ -371,7 +413,7 @@ export default {
371 }, 413 },
372 displayLabel(field) { 414 displayLabel(field) {
373 const m = this.form 415 const m = this.form
374 - const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopName: '请选择生产厂' } 416 + const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopName: '请选择生产厂', regionName: '请选择区域' }
375 const val = m[field] 417 const val = m[field]
376 return val ? String(val) : map[field] 418 return val ? String(val) : map[field]
377 }, 419 },
@@ -400,6 +442,8 @@ export default { @@ -400,6 +442,8 @@ export default {
400 setSheet('单价中是否已包含包装费', this.yesNoList) 442 setSheet('单价中是否已包含包装费', this.yesNoList)
401 } else if (field === 'includesTransportFee') { 443 } else if (field === 'includesTransportFee') {
402 setSheet('单价中是否已包含运费', this.yesNoList) 444 setSheet('单价中是否已包含运费', this.yesNoList)
  445 + } else if (field === 'region') {
  446 + setSheet('区域', this.regionOptions)
403 } 447 }
404 }, 448 },
405 onSheetConfirm({ value, label }) { 449 onSheetConfirm({ value, label }) {
@@ -449,6 +493,7 @@ export default { @@ -449,6 +493,7 @@ export default {
449 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val))) 493 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
450 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false } 494 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
451 } 495 }
  496 + if (!this.$refs.productRel.validate()) return false
452 const list = Array.isArray(this.newProductLineList) ? this.newProductLineList : [] 497 const list = Array.isArray(this.newProductLineList) ? this.newProductLineList : []
453 if (list.length === 0) { 498 if (list.length === 0) {
454 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false 499 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false
@@ -60,14 +60,14 @@ @@ -60,14 +60,14 @@
60 </uni-list-item> 60 </uni-list-item>
61 <uni-list-item title="厚度公差上限(mm)"> 61 <uni-list-item title="厚度公差上限(mm)">
62 <template v-slot:footer> 62 <template v-slot:footer>
63 - <uni-easyinput type="digit" v-model="item.thicknessTolPos" :inputBorder="false"  
64 - placeholder="请输入厚度公差上限" @input="onNonNegativeInput(idx, 'thicknessTolPos')" @blur="onNonNegativeBlur(idx, 'thicknessTolPos', 2)" /> 63 + <uni-easyinput type="text" v-model="item.thicknessTolPos" :inputBorder="false"
  64 + placeholder="请输入厚度公差上限" @input="onNumberInput(idx, 'thicknessTolPos')" @blur="onNumberBlur(idx, 'thicknessTolPos', 2)" />
65 </template> 65 </template>
66 </uni-list-item> 66 </uni-list-item>
67 <uni-list-item title="厚度公差下限(mm)"> 67 <uni-list-item title="厚度公差下限(mm)">
68 <template v-slot:footer> 68 <template v-slot:footer>
69 - <uni-easyinput type="digit" v-model="item.thicknessTolNeg" :inputBorder="false"  
70 - placeholder="请输入厚度公差下限" @input="onNonNegativeInput(idx, 'thicknessTolNeg')" @blur="onNonNegativeBlur(idx, 'thicknessTolNeg', 2)" /> 69 + <uni-easyinput type="text" v-model="item.thicknessTolNeg" :inputBorder="false"
  70 + placeholder="请输入厚度公差下限" @input="onNumberInput(idx, 'thicknessTolNeg')" @blur="onNumberBlur(idx, 'thicknessTolNeg', 2)" />
71 </template> 71 </template>
72 </uni-list-item> 72 </uni-list-item>
73 <uni-list-item title="宽度(mm)"> 73 <uni-list-item title="宽度(mm)">
@@ -77,12 +77,12 @@ @@ -77,12 +77,12 @@
77 </uni-list-item> 77 </uni-list-item>
78 <uni-list-item title="宽度公差上限(mm)"> 78 <uni-list-item title="宽度公差上限(mm)">
79 <template v-slot:footer> 79 <template v-slot:footer>
80 - <uni-easyinput type="digit" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差上限" @input="onNonNegativeInput(idx, 'widthTolPos')" @blur="onNonNegativeBlur(idx, 'widthTolPos', 2)" /> 80 + <uni-easyinput type="text" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差上限" @input="onNumberInput(idx, 'widthTolPos')" @blur="onNumberBlur(idx, 'widthTolPos', 2)" />
81 </template> 81 </template>
82 </uni-list-item> 82 </uni-list-item>
83 <uni-list-item title="宽度公差下限(mm)"> 83 <uni-list-item title="宽度公差下限(mm)">
84 <template v-slot:footer> 84 <template v-slot:footer>
85 - <uni-easyinput type="digit" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差下限" @input="onNonNegativeInput(idx, 'widthTolNeg')" @blur="onNonNegativeBlur(idx, 'widthTolNeg', 2)" /> 85 + <uni-easyinput type="text" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差下限" @input="onNumberInput(idx, 'widthTolNeg')" @blur="onNumberBlur(idx, 'widthTolNeg', 2)" />
86 </template> 86 </template>
87 </uni-list-item> 87 </uni-list-item>
88 <uni-list-item title="长度(mm)"> 88 <uni-list-item title="长度(mm)">
@@ -92,14 +92,14 @@ @@ -92,14 +92,14 @@
92 </uni-list-item> 92 </uni-list-item>
93 <uni-list-item title="长度公差上限(mm)"> 93 <uni-list-item title="长度公差上限(mm)">
94 <template v-slot:footer> 94 <template v-slot:footer>
95 - <uni-easyinput type="digit" v-model="item.lengthTolPos" :inputBorder="false"  
96 - placeholder="请输入长度公差上限" @input="onNonNegativeInput(idx, 'lengthTolPos')" @blur="onNonNegativeBlur(idx, 'lengthTolPos', 2)" /> 95 + <uni-easyinput type="text" v-model="item.lengthTolPos" :inputBorder="false"
  96 + placeholder="请输入长度公差上限" @input="onNumberInput(idx, 'lengthTolPos')" @blur="onNumberBlur(idx, 'lengthTolPos', 2)" />
97 </template> 97 </template>
98 </uni-list-item> 98 </uni-list-item>
99 <uni-list-item title="长度公差下限(mm)"> 99 <uni-list-item title="长度公差下限(mm)">
100 <template v-slot:footer> 100 <template v-slot:footer>
101 - <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false"  
102 - placeholder="请输入长度公差下限" @input="onNonNegativeInput(idx, 'lengthTolNeg')" @blur="onNonNegativeBlur(idx, 'lengthTolNeg', 2)" /> 101 + <uni-easyinput type="text" v-model="item.lengthTolNeg" :inputBorder="false"
  102 + placeholder="请输入长度公差下限" @input="onNumberInput(idx, 'lengthTolNeg')" @blur="onNumberBlur(idx, 'lengthTolNeg', 2)" />
103 </template> 103 </template>
104 </uni-list-item> 104 </uni-list-item>
105 <uni-list-item title="状态"> 105 <uni-list-item title="状态">
@@ -257,6 +257,110 @@ export default { @@ -257,6 +257,110 @@ export default {
257 this.recalculateAll() 257 this.recalculateAll()
258 }, 258 },
259 methods: { 259 methods: {
  260 + onNumberInput(idx, field) {
  261 + const it = this.items[idx]
  262 + if (!it) return
  263 + let v = String(it[field] != null ? it[field] : '')
  264 + // Allow numbers, decimal point, and negative sign
  265 + // But since this is a simple input, maybe just allow everything and validate later?
  266 + // Or better, restrict to valid number characters: 0-9, ., -
  267 + v = v.replace(/[^0-9.-]/g, '')
  268 +
  269 + // Handle multiple dots: keep only the first one
  270 + const parts = v.split('.')
  271 + if (parts.length > 2) {
  272 + v = parts[0] + '.' + parts.slice(1).join('')
  273 + }
  274 +
  275 + // Handle multiple negative signs: keep only at start
  276 + if (v.indexOf('-') > 0) {
  277 + v = v.replace(/-/g, '') // remove all
  278 + // Logic to put it back is complex if user types in middle,
  279 + // but standard behavior is usually just stripping invalid ones.
  280 + // Let's just strip non-leading minus
  281 + }
  282 + // A simpler regex approach for "start with optional minus, then digits/dots" is hard in one replace.
  283 + // Let's stick to a simple cleanup:
  284 +
  285 + // 1. Remove anything that is not digit, dot, or minus
  286 + v = v.replace(/[^0-9.-]/g, '')
  287 +
  288 + // 2. Ensure minus is only at index 0
  289 + if (v.lastIndexOf('-') > 0) {
  290 + v = (v.startsWith('-') ? '-' : '') + v.replace(/-/g, '')
  291 + }
  292 +
  293 + // 3. Ensure only one dot
  294 + const firstDotIndex = v.indexOf('.')
  295 + if (firstDotIndex !== -1) {
  296 + const before = v.substring(0, firstDotIndex + 1)
  297 + const after = v.substring(firstDotIndex + 1).replace(/\./g, '')
  298 + v = before + after
  299 + }
  300 +
  301 + // 4. If it starts with dot (or -. ), maybe prefix 0?
  302 + // -0.5 is valid. .5 is valid (becomes 0.5). -.5 becomes -0.5
  303 + if (v.startsWith('.')) v = '0' + v
  304 + if (v.startsWith('-.')) v = '-0' + v.substring(1)
  305 +
  306 + it[field] = v
  307 + this.$set(this.items, idx, it)
  308 + },
  309 + onNumberBlur(idx, field, digits) {
  310 + const it = this.items[idx]
  311 + if (!it) return
  312 + const raw = it[field]
  313 + if (raw === '' || raw === null || raw === undefined || raw === '-') {
  314 + // if just "-", clear it? or keep it? usually clear or 0.
  315 + // If it's optional tolerance, maybe empty string is better than 0 if user cleared it.
  316 + // But previously we used 0 for numbers.
  317 + // However, for tolerances, empty might mean "no tolerance specified".
  318 + // Let's check existing logic. onNonNegativeBlur sets to 0 if empty/invalid.
  319 + // For tolerance, maybe we want to allow empty?
  320 + // The requirement says "两个都有值时，上限 要大于 下限".
  321 + // If I set to 0, then 0 > 0 is false.
  322 + // Let's assume empty is allowed.
  323 + // But wait, "number type".
  324 + // Let's try to parse.
  325 + if (raw === '' || raw === null || raw === undefined) {
  326 + this.$set(this.items, idx, it)
  327 + return
  328 + }
  329 + }
  330 +
  331 + let num = this.toNumber(raw)
  332 + if (isNaN(num)) {
  333 + // If invalid input, maybe reset to empty or 0?
  334 + // Let's set to 0 if it was required, but tolerance might be optional.
  335 + // If the user entered garbage, clear it.
  336 + it[field] = ''
  337 + } else {
  338 + const rounded = this.round(num, digits)
  339 + it[field] = rounded
  340 + }
  341 + this.$set(this.items, idx, it)
  342 + },
  343 + validate() {
  344 + for (let i = 0; i < this.items.length; i++) {
  345 + const it = this.items[i]
  346 + const check = (pos, neg, label) => {
  347 + if (pos !== '' && pos !== null && pos !== undefined &&
  348 + neg !== '' && neg !== null && neg !== undefined) {
  349 + if (Number(pos) <= Number(neg)) {
  350 + return `第${i + 1}行产品：${label}公差上限必须大于下限`
  351 + }
  352 + }
  353 + return null
  354 + }
  355 + let err = check(it.thicknessTolPos, it.thicknessTolNeg, '厚度')
  356 + if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
  357 + err = check(it.widthTolPos, it.widthTolNeg, '宽度')
  358 + if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
  359 + err = check(it.lengthTolPos, it.lengthTolNeg, '长度')
  360 + if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
  361 + }
  362 + return true
  363 + },
260 defaultItem() { 364 defaultItem() {
261 return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '' } 365 return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '' }
262 }, 366 },
@@ -21,6 +21,13 @@ @@ -21,6 +21,13 @@
21 <view class="item-title"><text class="required">*</text><text>需方</text></view> 21 <view class="item-title"><text class="required">*</text><text>需方</text></view>
22 </template> 22 </template>
23 </uni-list-item> 23 </uni-list-item>
  24 + <uni-list-item class="select-item" :class="form.stockUpCompanyId ? 'is-filled' : 'is-empty'" clickable
  25 + @click="openRelate('stockUpCompanyId')" :rightText="form.stockUpCompanyName || '请选择备货单位'" showArrow>
  26 + <template v-slot:body>
  27 + <view class="item-title"><text class="required">*</text><text>备货单位/人（生产标准）</text></view>
  28 + </template>
  29 + </uni-list-item>
  30 +
24 31
25 <uni-list-item title="订货日期"> 32 <uni-list-item title="订货日期">
26 <template v-slot:footer> 33 <template v-slot:footer>
@@ -39,7 +46,18 @@ @@ -39,7 +46,18 @@
39 <view class="item-title"><text class="required">*</text><text>生产厂</text></view> 46 <view class="item-title"><text class="required">*</text><text>生产厂</text></view>
40 </template> 47 </template>
41 </uni-list-item> 48 </uni-list-item>
42 - <ProductRel mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" @change="onProductsChange" :options="productList" /> 49 + <uni-list-item title="办事处">
  50 + <template v-slot:footer>
  51 + <uni-easyinput v-model="form.deptName" :inputBorder="false" disabled placeholder="自动获取" />
  52 + </template>
  53 + </uni-list-item>
  54 + <uni-list-item class="select-item" :class="form.region ? 'is-filled' : 'is-empty'" clickable
  55 + @click="openSheet('region')" :rightText="displayLabel('regionName')" showArrow>
  56 + <template v-slot:body>
  57 + <view class="item-title"><text class="required">*</text><text>区域</text></view>
  58 + </template>
  59 + </uni-list-item>
  60 + <ProductRel ref="productRel" mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" @change="onProductsChange" :options="productList" />
43 <uni-list-item title="合计人民币金额（大写）"> 61 <uni-list-item title="合计人民币金额（大写）">
44 <template v-slot:footer> 62 <template v-slot:footer>
45 <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false" disabled /> 63 <uni-easyinput v-model="form.totalAmountCapital" placeholder="自动计算" :inputBorder="false" disabled />
@@ -208,10 +226,11 @@ import SingleSelectSheet from '@/components/single-select/index.vue' @@ -208,10 +226,11 @@ import SingleSelectSheet from '@/components/single-select/index.vue'
208 import RelateSelectSheet from '@/components/relate-select/index.vue' 226 import RelateSelectSheet from '@/components/relate-select/index.vue'
209 import ProductRel from './productRel.vue' 227 import ProductRel from './productRel.vue'
210 import CitySelector from '@/components/city-selector/index.vue' 228 import CitySelector from '@/components/city-selector/index.vue'
211 -import { getRetailCodeApi, createContractApi, getCustomerRemarks,getCustomerSpecificQualityRequirements } from '@/api/contract' 229 +import { getRetailCodeApi, createContractApi, getCustomerRemarks,getCustomerSpecificQualityRequirements, getDeptApi } from '@/api/contract'
212 import { getDicByCodes } from '@/utils/dic' 230 import { getDicByCodes } from '@/utils/dic'
213 import { formatCurrencyToChinese } from '@/utils/common' 231 import { formatCurrencyToChinese } from '@/utils/common'
214 import { workshopQueryApi } from '@/api/devManage' 232 import { workshopQueryApi } from '@/api/devManage'
  233 +import { getArea } from '@/api/credit_manage.js'
215 234
216 export default { 235 export default {
217 name: 'AddContractUnplan', 236 name: 'AddContractUnplan',
@@ -224,6 +243,8 @@ export default { @@ -224,6 +243,8 @@ export default {
224 supplierName: '', 243 supplierName: '',
225 buyer: '', 244 buyer: '',
226 buyerName: '', 245 buyerName: '',
  246 + stockUpCompanyId: '',
  247 + stockUpCompanyName: '',
227 orderDate: '', 248 orderDate: '',
228 deliveryDate: '', 249 deliveryDate: '',
229 designatedConsignee: '', 250 designatedConsignee: '',
@@ -242,6 +263,10 @@ export default { @@ -242,6 +263,10 @@ export default {
242 destinationLabel: '', 263 destinationLabel: '',
243 workshopIdName: '', 264 workshopIdName: '',
244 workshopId: '', 265 workshopId: '',
  266 + deptName: '',
  267 + deptId: '',
  268 + region: '',
  269 + regionName: '',
245 remarks: '', 270 remarks: '',
246 component: '', 271 component: '',
247 packaging: '', 272 packaging: '',
@@ -263,12 +288,15 @@ export default { @@ -263,12 +288,15 @@ export default {
263 productList: [], 288 productList: [],
264 customerRemarks: [], 289 customerRemarks: [],
265 defaultRemark: '', 290 defaultRemark: '',
  291 + regionOptions: [],
266 } 292 }
267 }, 293 },
268 created() { 294 created() {
269 this.loadSuppliers() 295 this.loadSuppliers()
270 this.loadExtraOptions() 296 this.loadExtraOptions()
271 this.initCode() 297 this.initCode()
  298 + this.getDept()
  299 + this.loadRegionOptions()
272 this.form.orderDate = this.formatDate(new Date()) 300 this.form.orderDate = this.formatDate(new Date())
273 this.$nextTick(() => { 301 this.$nextTick(() => {
274 if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) { 302 if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
@@ -319,6 +347,24 @@ export default { @@ -319,6 +347,24 @@ export default {
319 }, 347 },
320 }, 348 },
321 methods: { 349 methods: {
  350 + async loadRegionOptions() {
  351 + try {
  352 + const res = await getArea()
  353 + const list = res.data || []
  354 + this.regionOptions = (list || []).map(it => ({ label: it.name || '', value: it.id || '' }))
  355 + } catch (e) {
  356 + this.regionOptions = []
  357 + }
  358 + },
  359 + // 查询当前人所在办事处
  360 + getDept() {
  361 + getDeptApi().then(res => {
  362 + if (res.code === 200) {
  363 + this.form.deptName = res.data.name || ''
  364 + this.form.deptId = res.data.id || ''
  365 + }
  366 + })
  367 + },
322 getHistory() { 368 getHistory() {
323 console.log('this.productLineList', this.productLineList[0].productId) 369 console.log('this.productLineList', this.productLineList[0].productId)
324 if (!this.productLineList.length || !this.productLineList[0].productId) { 370 if (!this.productLineList.length || !this.productLineList[0].productId) {
@@ -407,7 +453,7 @@ export default { @@ -407,7 +453,7 @@ export default {
407 }, 453 },
408 displayLabel(field) { 454 displayLabel(field) {
409 const m = this.form 455 const m = this.form
410 - const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopIdName: '请选择生产厂' } 456 + const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopIdName: '请选择生产厂', regionName: '请选择区域' }
411 const val = m[field] 457 const val = m[field]
412 return val ? String(val) : map[field] 458 return val ? String(val) : map[field]
413 }, 459 },
@@ -452,6 +498,8 @@ export default { @@ -452,6 +498,8 @@ export default {
452 setSheet('单价中是否已包含运费', this.yesNoList) 498 setSheet('单价中是否已包含运费', this.yesNoList)
453 } else if (field === 'historyRemarks') { 499 } else if (field === 'historyRemarks') {
454 setSheet('历史备注', this.customerRemarks) 500 setSheet('历史备注', this.customerRemarks)
  501 + } else if (field === 'region') {
  502 + setSheet('区域', this.regionOptions)
455 } 503 }
456 }, 504 },
457 onSheetConfirm({ value, label }) { 505 onSheetConfirm({ value, label }) {
@@ -546,6 +594,7 @@ export default { @@ -546,6 +594,7 @@ export default {
546 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val))) 594 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
547 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false } 595 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
548 } 596 }
  597 + if (this.$refs.productRel && !this.$refs.productRel.validate()) return false
549 const list = Array.isArray(this.productLineList) ? this.productLineList : [] 598 const list = Array.isArray(this.productLineList) ? this.productLineList : []
550 if (list.length === 0) { 599 if (list.length === 0) {
551 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false 600 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false
@@ -14,6 +14,10 @@ @@ -14,6 +14,10 @@
14 <view class="row"><text class="label">单位</text><text class="value">{{ detail.unit }}</text></view> 14 <view class="row"><text class="label">单位</text><text class="value">{{ detail.unit }}</text></view>
15 <view class="row"><text class="label">生产厂</text><text class="value">{{ detail.workshopName || '-' 15 <view class="row"><text class="label">生产厂</text><text class="value">{{ detail.workshopName || '-'
16 }}</text></view> 16 }}</text></view>
  17 + <view class="row"><text class="label">办事处</text><text class="value">{{ detail.deptName || '-'
  18 + }}</text></view>
  19 + <view class="row"><text class="label">区域</text><text class="value">{{ detail.regionName || '-'
  20 + }}</text></view>
17 </view> 21 </view>
18 22
19 <view class="section1"> 23 <view class="section1">
@@ -449,6 +453,11 @@ export default { @@ -449,6 +453,11 @@ export default {
449 this.detail = { 453 this.detail = {
450 ...this.detail, 454 ...this.detail,
451 ...data, 455 ...data,
  456 + stockUpCompanyId: data.stockUpCompanyId || '',
  457 + stockUpCompanyName: data.stockUpCompanyName || '',
  458 + deptName: data.deptName || '',
  459 + region: data.region || '',
  460 + regionName: data.regionName || '',
452 includesPackagingFeeName, includesTransportFeeName, 461 includesPackagingFeeName, includesTransportFeeName,
453 destinationId: data.provinceId && data.cityId && data.districtId ? [data.provinceId, data.cityId, data.districtId] : '', 462 destinationId: data.provinceId && data.cityId && data.districtId ? [data.provinceId, data.cityId, data.districtId] : '',
454 destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '', 463 destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '',
@@ -21,7 +21,12 @@ @@ -21,7 +21,12 @@
21 <view class="item-title"><text class="required">*</text><text>需方</text></view> 21 <view class="item-title"><text class="required">*</text><text>需方</text></view>
22 </template> 22 </template>
23 </uni-list-item> 23 </uni-list-item>
24 - 24 + <uni-list-item class="select-item" :class="form.stockUpCompanyId ? 'is-filled' : 'is-empty'" clickable
  25 + @click="openRelate('stockUpCompanyId')" :rightText="form.stockUpCompanyName || '请选择备货单位'" showArrow>
  26 + <template v-slot:body>
  27 + <view class="item-title"><text class="required">*</text><text>备货单位/人（生产标准）</text></view>
  28 + </template>
  29 + </uni-list-item>
25 <uni-list-item class="select-item" :class="form.workshopId ? 'is-filled' : 'is-empty'" clickable 30 <uni-list-item class="select-item" :class="form.workshopId ? 'is-filled' : 'is-empty'" clickable
26 @click="openSheet('workshopId')" :rightText="form.workshopName || '请选择生产厂'" showArrow> 31 @click="openSheet('workshopId')" :rightText="form.workshopName || '请选择生产厂'" showArrow>
27 <template v-slot:body> 32 <template v-slot:body>
@@ -40,8 +45,18 @@ @@ -40,8 +45,18 @@
40 <uni-easyinput v-model="form.unit" :inputBorder="false" disabled /> 45 <uni-easyinput v-model="form.unit" :inputBorder="false" disabled />
41 </template> 46 </template>
42 </uni-list-item> 47 </uni-list-item>
43 -  
44 - <ProductRel mode="add" :deliveryDateBase="form.deliveryDate" :deliveryDate="form.orderDate" :list="productLineList" @change="onProductsChange" :options="productList" /> 48 + <uni-list-item title="办事处">
  49 + <template v-slot:footer>
  50 + <uni-easyinput v-model="form.deptName" :inputBorder="false" disabled placeholder="自动获取" />
  51 + </template>
  52 + </uni-list-item>
  53 + <uni-list-item class="select-item" :class="form.region ? 'is-filled' : 'is-empty'" clickable
  54 + @click="openSheet('region')" :rightText="displayLabel('regionName')" showArrow>
  55 + <template v-slot:body>
  56 + <view class="item-title"><text class="required">*</text><text>区域</text></view>
  57 + </template>
  58 + </uni-list-item>
  59 + <ProductRel ref="productRel" mode="add" :deliveryDateBase="form.deliveryDate" :deliveryDate="form.orderDate" :list="productLineList" @change="onProductsChange" :options="productList" />
45 60
46 <uni-list-item title="合计人民币金额（大写）"> 61 <uni-list-item title="合计人民币金额（大写）">
47 <template v-slot:footer> 62 <template v-slot:footer>
@@ -195,10 +210,11 @@ import SingleSelectSheet from '@/components/single-select/index.vue' @@ -195,10 +210,11 @@ import SingleSelectSheet from '@/components/single-select/index.vue'
195 import RelateSelectSheet from '@/components/relate-select/index.vue' 210 import RelateSelectSheet from '@/components/relate-select/index.vue'
196 import ProductRel from './productRel.vue' 211 import ProductRel from './productRel.vue'
197 import CitySelector from '@/components/city-selector/index.vue' 212 import CitySelector from '@/components/city-selector/index.vue'
198 -import { getContractApi, updateContractApi } from '@/api/contract' 213 +import { getContractApi, updateContractApi, getDeptApi } from '@/api/contract'
199 import { getDicByCodes } from '@/utils/dic' 214 import { getDicByCodes } from '@/utils/dic'
200 import { formatCurrencyToChinese } from '@/utils/common' 215 import { formatCurrencyToChinese } from '@/utils/common'
201 import { workshopQueryApi } from '@/api/devManage' 216 import { workshopQueryApi } from '@/api/devManage'
  217 +import { getArea } from '@/api/credit_manage.js'
202 export default { 218 export default {
203 name: 'ModifyContractUnplan', 219 name: 'ModifyContractUnplan',
204 components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector }, 220 components: { SingleSelectSheet, RelateSelectSheet, ProductRel, CitySelector },
@@ -212,8 +228,14 @@ export default { @@ -212,8 +228,14 @@ export default {
212 supplierName: '', 228 supplierName: '',
213 buyer: '', 229 buyer: '',
214 buyerName: '', 230 buyerName: '',
  231 + stockUpCompanyId: '',
  232 + stockUpCompanyName: '',
215 workshopId: '', 233 workshopId: '',
216 workshopName: '', 234 workshopName: '',
  235 + deptName: '',
  236 + deptId: '',
  237 + region: '',
  238 + regionName: '',
217 orderDate: '', 239 orderDate: '',
218 deliveryDate: '', 240 deliveryDate: '',
219 designatedConsignee: '', 241 designatedConsignee: '',
@@ -254,7 +276,8 @@ export default { @@ -254,7 +276,8 @@ export default {
254 totalAmountIncludingTax: 0, 276 totalAmountIncludingTax: 0,
255 productLineList: [], 277 productLineList: [],
256 newProductLineList: [], 278 newProductLineList: [],
257 - productList: [] 279 + productList: [],
  280 + regionOptions: [],
258 } 281 }
259 }, 282 },
260 onLoad(query) { 283 onLoad(query) {
@@ -264,6 +287,7 @@ export default { @@ -264,6 +287,7 @@ export default {
264 this.loadSuppliers() 287 this.loadSuppliers()
265 this.loadExtraOptions() 288 this.loadExtraOptions()
266 this.loadDetail() 289 this.loadDetail()
  290 + this.loadRegionOptions()
267 this.$nextTick(() => { 291 this.$nextTick(() => {
268 if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) { 292 if (Array.isArray(this.form.destinationId) && this.form.destinationId.length) {
269 this.initDestinationLabel() 293 this.initDestinationLabel()
@@ -271,6 +295,15 @@ export default { @@ -271,6 +295,15 @@ export default {
271 }) 295 })
272 }, 296 },
273 methods: { 297 methods: {
  298 + async loadRegionOptions() {
  299 + try {
  300 + const res = await getArea()
  301 + const list = res.data || []
  302 + this.regionOptions = (list || []).map(it => ({ label: it.name || '', value: it.id || '' }))
  303 + } catch (e) {
  304 + this.regionOptions = []
  305 + }
  306 + },
274 async loadDetail() { 307 async loadDetail() {
275 if (!this.id) return 308 if (!this.id) return
276 try { 309 try {
@@ -287,6 +320,12 @@ export default { @@ -287,6 +320,12 @@ export default {
287 supplierName: m.supplierName || '', 320 supplierName: m.supplierName || '',
288 buyer: m.buyer || (m.customer && m.customer.id) || '', 321 buyer: m.buyer || (m.customer && m.customer.id) || '',
289 buyerName: m.buyerName || (m.customer && m.customer.name) || '', 322 buyerName: m.buyerName || (m.customer && m.customer.name) || '',
  323 + stockUpCompanyId: m.stockUpCompanyId || '',
  324 + stockUpCompanyName: m.stockUpCompanyName || '',
  325 + deptName: m.deptName || '',
  326 + deptId: m.deptId || '',
  327 + region: m.region || '',
  328 + regionName: m.regionName || '',
290 orderDate: m.orderDate || '', 329 orderDate: m.orderDate || '',
291 designatedConsignee: m.designatedConsignee || '', 330 designatedConsignee: m.designatedConsignee || '',
292 specialTerms: m.specialTerms || '', 331 specialTerms: m.specialTerms || '',
@@ -371,7 +410,7 @@ export default { @@ -371,7 +410,7 @@ export default {
371 }, 410 },
372 displayLabel(field) { 411 displayLabel(field) {
373 const m = this.form 412 const m = this.form
374 - const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopName: '请选择生产厂' } 413 + const map = { supplierName: '请选择供方', buyerName: '请选择需方', workshopName: '请选择生产厂', regionName: '请选择区域' }
375 const val = m[field] 414 const val = m[field]
376 return val ? String(val) : map[field] 415 return val ? String(val) : map[field]
377 }, 416 },
@@ -400,6 +439,8 @@ export default { @@ -400,6 +439,8 @@ export default {
400 setSheet('单价中是否已包含包装费', this.yesNoList) 439 setSheet('单价中是否已包含包装费', this.yesNoList)
401 } else if (field === 'includesTransportFee') { 440 } else if (field === 'includesTransportFee') {
402 setSheet('单价中是否已包含运费', this.yesNoList) 441 setSheet('单价中是否已包含运费', this.yesNoList)
  442 + } else if (field === 'region') {
  443 + setSheet('区域', this.regionOptions)
403 } 444 }
404 }, 445 },
405 onSheetConfirm({ value, label }) { 446 onSheetConfirm({ value, label }) {
@@ -439,9 +480,11 @@ export default { @@ -439,9 +480,11 @@ export default {
439 { key: 'code', label: '编号' }, 480 { key: 'code', label: '编号' },
440 { key: 'supplier', label: '供方' }, 481 { key: 'supplier', label: '供方' },
441 { key: 'buyer', label: '需方' }, 482 { key: 'buyer', label: '需方' },
  483 + { key: 'stockUpCompanyId', label: '备货单位/人（生产标准）' },
442 { key: 'orderDate', label: '订货日期' }, 484 { key: 'orderDate', label: '订货日期' },
443 { key: 'unit', label: '单位' }, 485 { key: 'unit', label: '单位' },
444 { key: 'workshopId', label: '生产厂' }, 486 { key: 'workshopId', label: '生产厂' },
  487 + { key: 'region', label: '区域' },
445 { key: 'specialTerms', label: '特别条款要求' }, 488 { key: 'specialTerms', label: '特别条款要求' },
446 ] 489 ]
447 for (const it of checks) { 490 for (const it of checks) {
@@ -449,6 +492,7 @@ export default { @@ -449,6 +492,7 @@ export default {
449 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val))) 492 const empty = (val === undefined || val === null || (typeof val === 'string' && val.trim() === '') || (typeof val === 'number' && isNaN(val)))
450 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false } 493 if (empty) { uni.showToast({ title: `请先选择${it.label}`, icon: 'none' }); return false }
451 } 494 }
  495 + if (this.$refs.productRel && !this.$refs.productRel.validate()) return false
452 const list = Array.isArray(this.newProductLineList) ? this.newProductLineList : [] 496 const list = Array.isArray(this.newProductLineList) ? this.newProductLineList : []
453 if (list.length === 0) { 497 if (list.length === 0) {
454 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false 498 uni.showToast({ title: '请至少添加一条产品明细', icon: 'none' }); return false
@@ -752,4 +796,4 @@ export default { @@ -752,4 +796,4 @@ export default {
752 } 796 }
753 } 797 }
754 798
755 -</style>  
  799 +</style>
@@ -60,14 +60,14 @@ @@ -60,14 +60,14 @@
60 </uni-list-item> 60 </uni-list-item>
61 <uni-list-item title="厚度公差上限(mm)"> 61 <uni-list-item title="厚度公差上限(mm)">
62 <template v-slot:footer> 62 <template v-slot:footer>
63 - <uni-easyinput type="digit" v-model="item.thicknessTolPos" :inputBorder="false"  
64 - placeholder="请输入厚度公差上限" @input="onNonNegativeInput(idx, 'thicknessTolPos')" @blur="onNonNegativeBlur(idx, 'thicknessTolPos', 2)" /> 63 + <uni-easyinput type="text" v-model="item.thicknessTolPos" :inputBorder="false"
  64 + placeholder="请输入厚度公差上限" @input="onNumberInput(idx, 'thicknessTolPos')" @blur="onNumberBlur(idx, 'thicknessTolPos', 2)" />
65 </template> 65 </template>
66 </uni-list-item> 66 </uni-list-item>
67 <uni-list-item title="厚度公差下限(mm)"> 67 <uni-list-item title="厚度公差下限(mm)">
68 <template v-slot:footer> 68 <template v-slot:footer>
69 - <uni-easyinput type="digit" v-model="item.thicknessTolNeg" :inputBorder="false"  
70 - placeholder="请输入厚度公差下限" @input="onNonNegativeInput(idx, 'thicknessTolNeg')" @blur="onNonNegativeBlur(idx, 'thicknessTolNeg', 2)" /> 69 + <uni-easyinput type="text" v-model="item.thicknessTolNeg" :inputBorder="false"
  70 + placeholder="请输入厚度公差下限" @input="onNumberInput(idx, 'thicknessTolNeg')" @blur="onNumberBlur(idx, 'thicknessTolNeg', 2)" />
71 </template> 71 </template>
72 </uni-list-item> 72 </uni-list-item>
73 <uni-list-item title="宽度(mm)"> 73 <uni-list-item title="宽度(mm)">
@@ -77,12 +77,12 @@ @@ -77,12 +77,12 @@
77 </uni-list-item> 77 </uni-list-item>
78 <uni-list-item title="宽度公差上限(mm)"> 78 <uni-list-item title="宽度公差上限(mm)">
79 <template v-slot:footer> 79 <template v-slot:footer>
80 - <uni-easyinput type="digit" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差上限" @input="onNonNegativeInput(idx, 'widthTolPos')" @blur="onNonNegativeBlur(idx, 'widthTolPos', 2)" /> 80 + <uni-easyinput type="text" v-model="item.widthTolPos" :inputBorder="false" placeholder="请输入宽度公差上限" @input="onNumberInput(idx, 'widthTolPos')" @blur="onNumberBlur(idx, 'widthTolPos', 2)" />
81 </template> 81 </template>
82 </uni-list-item> 82 </uni-list-item>
83 <uni-list-item title="宽度公差下限(mm)"> 83 <uni-list-item title="宽度公差下限(mm)">
84 <template v-slot:footer> 84 <template v-slot:footer>
85 - <uni-easyinput type="digit" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差下限" @input="onNonNegativeInput(idx, 'widthTolNeg')" @blur="onNonNegativeBlur(idx, 'widthTolNeg', 2)" /> 85 + <uni-easyinput type="text" v-model="item.widthTolNeg" :inputBorder="false" placeholder="请输入宽度公差下限" @input="onNumberInput(idx, 'widthTolNeg')" @blur="onNumberBlur(idx, 'widthTolNeg', 2)" />
86 </template> 86 </template>
87 </uni-list-item> 87 </uni-list-item>
88 <uni-list-item title="长度(mm)"> 88 <uni-list-item title="长度(mm)">
@@ -92,14 +92,14 @@ @@ -92,14 +92,14 @@
92 </uni-list-item> 92 </uni-list-item>
93 <uni-list-item title="长度公差上限(mm)"> 93 <uni-list-item title="长度公差上限(mm)">
94 <template v-slot:footer> 94 <template v-slot:footer>
95 - <uni-easyinput type="digit" v-model="item.lengthTolPos" :inputBorder="false"  
96 - placeholder="请输入长度公差上限" @input="onNonNegativeInput(idx, 'lengthTolPos')" @blur="onNonNegativeBlur(idx, 'lengthTolPos', 2)" /> 95 + <uni-easyinput type="text" v-model="item.lengthTolPos" :inputBorder="false"
  96 + placeholder="请输入长度公差上限" @input="onNumberInput(idx, 'lengthTolPos')" @blur="onNumberBlur(idx, 'lengthTolPos', 2)" />
97 </template> 97 </template>
98 </uni-list-item> 98 </uni-list-item>
99 <uni-list-item title="长度公差下限(mm)"> 99 <uni-list-item title="长度公差下限(mm)">
100 <template v-slot:footer> 100 <template v-slot:footer>
101 - <uni-easyinput type="digit" v-model="item.lengthTolNeg" :inputBorder="false"  
102 - placeholder="请输入长度公差下限" @input="onNonNegativeInput(idx, 'lengthTolNeg')" @blur="onNonNegativeBlur(idx, 'lengthTolNeg', 2)" /> 101 + <uni-easyinput type="text" v-model="item.lengthTolNeg" :inputBorder="false"
  102 + placeholder="请输入长度公差下限" @input="onNumberInput(idx, 'lengthTolNeg')" @blur="onNumberBlur(idx, 'lengthTolNeg', 2)" />
103 </template> 103 </template>
104 </uni-list-item> 104 </uni-list-item>
105 <uni-list-item title="状态"> 105 <uni-list-item title="状态">
@@ -297,6 +297,52 @@ export default { @@ -297,6 +297,52 @@ export default {
297 this.$set(this.items, idx, it) 297 this.$set(this.items, idx, it)
298 if (field === 'quantity' || field === 'unitPrice') this.recalculate(idx) 298 if (field === 'quantity' || field === 'unitPrice') this.recalculate(idx)
299 }, 299 },
  300 + onNumberInput(idx, field) {
  301 + const it = this.items[idx]
  302 + if (!it) return
  303 + let v = String(it[field] != null ? it[field] : '')
  304 + v = v.replace(/[^0-9.\-]/g, '')
  305 + v = v.replace(/(\..*)\./g, '$1')
  306 + v = v.replace(/(?!^)-/g, '')
  307 + if (v.startsWith('.')) v = '0' + v
  308 + if (v.startsWith('-.')) v = '-0' + v.slice(1)
  309 + it[field] = v
  310 + this.$set(this.items, idx, it)
  311 + },
  312 + onNumberBlur(idx, field, digits) {
  313 + const it = this.items[idx]
  314 + if (!it) return
  315 + const raw = it[field]
  316 + if (raw === '' || raw === null || raw === undefined) {
  317 + this.$set(this.items, idx, it)
  318 + return
  319 + }
  320 + let num = this.toNumber(raw)
  321 + const rounded = this.round(num, digits)
  322 + it[field] = rounded
  323 + this.$set(this.items, idx, it)
  324 + },
  325 + validate() {
  326 + for (let i = 0; i < this.items.length; i++) {
  327 + const it = this.items[i]
  328 + const check = (pos, neg, label) => {
  329 + if (pos !== '' && pos !== null && pos !== undefined &&
  330 + neg !== '' && neg !== null && neg !== undefined) {
  331 + if (Number(pos) <= Number(neg)) {
  332 + return `第${i + 1}行产品：${label}公差上限必须大于下限`
  333 + }
  334 + }
  335 + return null
  336 + }
  337 + let err = check(it.thicknessTolPos, it.thicknessTolNeg, '厚度')
  338 + if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
  339 + err = check(it.widthTolPos, it.widthTolNeg, '宽度')
  340 + if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
  341 + err = check(it.lengthTolPos, it.lengthTolNeg, '长度')
  342 + if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
  343 + }
  344 + return true
  345 + },
300 formatCurrency(val) { 346 formatCurrency(val) {
301 if (val == null || val === '') return '' 347 if (val == null || val === '') return ''
302 const num = Number(val) 348 const num = Number(val)