Commit 725d1d3fe10e007510626d22d0758da193bfc5e2

Authored by 史婷婷
1 parent 0eabe176

feat: 新增加工标准合同优化-暂存

... ... @@ -61,7 +61,7 @@
61 61 <view class="item-title"><text class="required">*</text><text>区域</text></view>
62 62 </template>
63 63 </uni-list-item>
64   - <ProductRel ref="productRel" mode="add" :deliveryDateBase="form.deliveryDate" :deliveryDate="form.orderDate" @change="onProductsChange" :options="productList" :rawToProdRatioList="rawToProdRatioList" />
  64 + <ProductRel ref="productRel" mode="add" :deliveryDateBase="form.deliveryDate" :deliveryDate="form.orderDate" @change="onProductsChange" :options="productList" :rawToProdRatioList="rawToProdRatioList" :rawProductList="rawProductList" :rawProductGradeList="rawProductGradeList" />
65 65 <uni-list-item title="合计金额(大写)">
66 66 <template v-slot:footer>
67 67 <uni-easyinput v-model="form.totalAmountCapital" placeholder="" :inputBorder="false" disabled />
... ... @@ -295,6 +295,8 @@ export default {
295 295 defaultRemark: '',
296 296 regionOptions: [],
297 297 rawToProdRatioList: [],
  298 + rawProductList: [],
  299 + rawProductGradeList: [],
298 300 }
299 301 },
300 302 created() {
... ... @@ -441,7 +443,7 @@ export default {
441 443 },
442 444 async loadExtraOptions() {
443 445 try {
444   - const results = await getDicByCodes(['CONDITIONS_REQUIRED', 'APPLICABLE_STANDARD', 'CONTRACT_PRODUCT','RAW_TO_PROD_RATIO'])
  446 + const results = await getDicByCodes(['CONDITIONS_REQUIRED', 'APPLICABLE_STANDARD', 'CONTRACT_PRODUCT','RAW_TO_PROD_RATIO', 'RAW_MATERIAL', 'RAW_MATERIAL_GRADE'])
445 447 const c1 = results && results.CONDITIONS_REQUIRED && results.CONDITIONS_REQUIRED.data ? results.CONDITIONS_REQUIRED.data : []
446 448 const c2 = results && results.APPLICABLE_STANDARD && results.APPLICABLE_STANDARD.data ? results.APPLICABLE_STANDARD.data : []
447 449 const c3 = results && results.CONTRACT_PRODUCT && results.CONTRACT_PRODUCT.data ? results.CONTRACT_PRODUCT.data : []
... ... @@ -450,11 +452,15 @@ export default {
450 452 this.executionStandardList = c2.map(it => ({ label: it.name, value: it.code }))
451 453 this.productList = c3.map(it => ({ label: it.name, value: it.code }))
452 454 this.rawToProdRatioList = c4.map(it => ({ label: it.name, value: it.code }))
  455 + this.rawProductList = c5.map(it => ({ label: it.name, value: it.code }))
  456 + this.rawProductGradeList = c6.map(it => ({ label: it.name, value: it.code }))
453 457 } catch (e) {
454 458 this.specialTermsList = []
455 459 this.executionStandardList = []
456 460 this.productList = []
457 461 this.rawToProdRatioList = []
  462 + this.rawProductList = []
  463 + this.rawProductGradeList = []
458 464 }
459 465 },
460 466 displayLabel(field) {
... ...
... ... @@ -234,7 +234,9 @@ export default {
234 234 deliveryDateBase: { type: String, default: '' },
235 235 options: { type: Array, default: () => [] },
236 236 deliveryDate: { type: String, default: '' },
237   - rawToProdRatioList: { type: Array, default: () => [] }
  237 + rawToProdRatioList: { type: Array, default: () => [] },
  238 + rawProductList: { type: Array, default: () => [] },
  239 + rawProductGradeList: { type: Array, default: () => [] },
238 240 },
239 241 components: { SingleSelectSheet },
240 242 data() {
... ...