feat: 加工标准合同：

1.子表原材料名称替换词典 2.原材料排号，改为词典，和前面的原材料联动（startsWith判断）

feat: 加工标准合同：
1.子表原材料名称替换词典 2.原材料排号，改为词典，和前面的原材料联动（startsWith判断）
史婷婷
1 parent 725d1d3f
Showing 3 changed files with 46 additions and 9 deletions
pages/contract_process/add.vue
pages/contract_process/modify.vue
pages/contract_process/productRel.vue
--- a/pages/contract_process/add.vue
View file @278f161
+++ b/pages/contract_process/add.vue
View file @278f161
@@ -448,6 +448,8 @@ export default {
                 const c2 = results && results.APPLICABLE_STANDARD && results.APPLICABLE_STANDARD.data ? results.APPLICABLE_STANDARD.data : []
                 const c3 = results && results.CONTRACT_PRODUCT && results.CONTRACT_PRODUCT.data ? results.CONTRACT_PRODUCT.data : []
                 const c4 = results && results.RAW_TO_PROD_RATIO && results.RAW_TO_PROD_RATIO.data ? results.RAW_TO_PROD_RATIO.data : []
+                const c5 = results && results.RAW_MATERIAL && results.RAW_MATERIAL.data ? results.RAW_MATERIAL.data : []
+                const c6 = results && results.RAW_MATERIAL_GRADE && results.RAW_MATERIAL_GRADE.data ? results.RAW_MATERIAL_GRADE.data : []
                 this.specialTermsList = c1.map(it => ({ label: it.name, value: it.code }))
                 this.executionStandardList = c2.map(it => ({ label: it.name, value: it.code }))
                 this.productList = c3.map(it => ({ label: it.name, value: it.code }))
--- a/pages/contract_process/modify.vue
View file @278f161
+++ b/pages/contract_process/modify.vue
View file @278f161
@@ -41,7 +41,7 @@
                     </template>
                 </uni-list-item>
-                <ProductRel mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" :list="productLineList" @change="onProductsChange" :options="productList" />
+                <ProductRel mode="add" :deliveryDate="form.orderDate" :deliveryDateBase="form.deliveryDate" :list="productLineList" @change="onProductsChange" :options="productList"  :rawProductList="rawProductList" :rawProductGradeList="rawProductGradeList" />
                 <uni-list-item title="合计金额（大写）">
                     <template v-slot:footer>
@@ -266,6 +266,8 @@ export default {
             productList: [],
             regionOptions: [],
             rawToProdRatioList: [],
+            rawProductList: [],
+            rawProductGradeList: [],
         }
     },
     onLoad(query) {
@@ -383,20 +385,26 @@ export default {
         },
         async loadExtraOptions() {
             try {
-                const results = await getDicByCodes(['CONDITIONS_REQUIRED', 'APPLICABLE_STANDARD', 'CONTRACT_PRODUCT','RAW_TO_PROD_RATIO'])
+                const results = await getDicByCodes(['CONDITIONS_REQUIRED', 'APPLICABLE_STANDARD', 'CONTRACT_PRODUCT','RAW_TO_PROD_RATIO', 'RAW_MATERIAL', 'RAW_MATERIAL_GRADE'])
                 const c1 = results && results.CONDITIONS_REQUIRED && results.CONDITIONS_REQUIRED.data ? results.CONDITIONS_REQUIRED.data : []
                 const c2 = results && results.APPLICABLE_STANDARD && results.APPLICABLE_STANDARD.data ? results.APPLICABLE_STANDARD.data : []
                 const c3 = results && results.CONTRACT_PRODUCT && results.CONTRACT_PRODUCT.data ? results.CONTRACT_PRODUCT.data : []
                 const c4 = results && results.RAW_TO_PROD_RATIO && results.RAW_TO_PROD_RATIO.data ? results.RAW_TO_PROD_RATIO.data : []
+                 const c5 = results && results.RAW_MATERIAL && results.RAW_MATERIAL.data ? results.RAW_MATERIAL.data : []
+                const c6 = results && results.RAW_MATERIAL_GRADE && results.RAW_MATERIAL_GRADE.data ? results.RAW_MATERIAL_GRADE.data : []
                 this.rawToProdRatioList = c4.map(it => ({ label: it.name, value: it.code }))
                 this.specialTermsList = c1.map(it => ({ label: it.name, value: it.code }))
                 this.executionStandardList = c2.map(it => ({ label: it.name, value: it.code }))
                 this.productList = c3.map(it => ({ label: it.name, value: it.code }))
+                this.rawProductList = c5.map(it => ({ label: it.name, value: it.code }))
+                this.rawProductGradeList = c6.map(it => ({ label: it.name, value: it.code }))
             } catch (e) {
                 this.specialTermsList = []
                 this.executionStandardList = []
                 this.productList = []
                 this.rawToProdRatioList = []
+                this.rawProductList = []
+                this.rawProductGradeList = []
             }
         },
         displayLabel(field) {
--- a/pages/contract_process/productRel.vue
View file @278f161
+++ b/pages/contract_process/productRel.vue
View file @278f161
@@ -21,9 +21,9 @@
                             <view class="item-title"><text>原材料名称</text></view>
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="原材料牌号">
-                        <template v-slot:footer>
-                            <uni-easyinput v-model="item.rawProductGrade" :inputBorder="false" placeholder="请输入原材料牌号" />
+                    <uni-list-item class="select-item" :class="item.rawProductGradeName ? 'is-filled' : 'is-empty'" clickable @click="openProductGradeSheet(idx)" :rightText="item.rawProductGradeName || '请选择原材料牌号'" showArrow>
+                        <template v-slot:body>
+                            <view class="item-title"><text>原材料牌号</text></view>
                         </template>
                     </uni-list-item>
                     <uni-list-item title="行业">
@@ -38,9 +38,9 @@
                             <view class="item-title"><text>原材料名称</text></view>
                         </template>
                     </uni-list-item>
-                    <uni-list-item title="原材料牌号">  
-                        <template v-slot:footer>
-                            <uni-easyinput v-model="item.rawProductGrade" :inputBorder="false" placeholder="请输入原材料牌号" />
+                    <uni-list-item class="select-item" :class="item.rawProductGradeName ? 'is-filled' : 'is-empty'" clickable @click="openProductGradeSheet(idx)" :rightText="item.rawProductGradeName || '请选择原材料牌号'" showArrow>
+                        <template v-slot:body>
+                            <view class="item-title"><text>原材料牌号</text></view>
                         </template>
                     </uni-list-item>
                     <uni-list-item title="行业">
@@ -261,6 +261,12 @@ export default {
         value: o.value != null ? o.value : (o.id != null ? o.id : o.code)
       }))
     },
+    rawProductOptions() {
+      return Array.isArray(this.rawProductList) ? this.rawProductList : []
+    },
+    rawProductGradeOptions() {
+      return Array.isArray(this.rawProductGradeList) ? this.rawProductGradeList : []
+    },
     minDeliveryDate() {
       const s = this.deliveryDate
       if (!s) return ''
@@ -411,11 +417,25 @@ export default {
           return [t, w, l].filter(Boolean).join(' × ')
         },
         openProductSheet(idx) {
-            const opts = this.selectOptions
+            const opts = this.rawProductOptions
             const current = this.items[idx] && this.items[idx].rawProductId
             const match = opts.find(o => String(o.value) === String(current))
             this.sheet = { ...this.sheet, visible: true, title: '请选择原材料名称', options: opts, idx, value: match ? match.value : '', mode: 'product' }
         },
+        openProductGradeSheet(idx) {
+            const it = this.items[idx]
+            if (!it || !it.rawProductId) {
+                uni.showToast({ title: '请先选择原材料名称', icon: 'none' })
+                return
+            }
+            const opts = this.rawProductGradeOptions.filter(o => {
+                const code = o.value
+                return code && it.rawProductId && String(code).startsWith(String(it.rawProductId))
+            })
+            const current = it.rawProductGrade
+            const match = opts.find(o => String(o.value) === String(current))
+            this.sheet = { ...this.sheet, visible: true, title: '请选择原材料牌号', options: opts, idx, value: match ? match.value : '', mode: 'grade' }
+        },
         openProductTargetSheet(idx) {
             const opts = this.selectOptions
             const current = this.items[idx] && this.items[idx].productId
@@ -436,8 +456,15 @@ export default {
                 it.materialProductRatio = value
                 it.rawToProdRatioName = label || ''
             } else if (this.sheet.mode === 'product') {
+                if (it.rawProductId !== value) {
+                    it.rawProductGrade = ''
+                    it.rawProductGradeName = ''
+                }
                 it.rawProductId = value
                 it.rawProductName = label || ''
+            } else if (this.sheet.mode === 'grade') {
+                it.rawProductGrade = value
+                it.rawProductGradeName = label || ''
             } else if (this.sheet.mode === 'target') {
                 it.productId = value
                 it.productName = label || ''