单位部分优化

jnpf-java-boot/jnpf-web/src/views/scm/productWarehouse/form.vue

@@ -272,24 +272,17 @@
                     </el-col>
                     <el-col :span="8" v-if="judgeShow('inventoryUnitId')">
                         <jnpf-form-tip-item label="库存单位" v-if="judgeShow('inventoryUnitId')" prop="inventoryUnitId">
-
                             <JnpfSelect v-model="dataForm.inventoryUnitId" @change="changeData('inventoryUnitId', -1)"
                                 placeholder="请选择" :disabled="judgeWrite('inventoryUnitId')" clearable
-                                :style='{ "width": "100%" }' :options="inventoryUnitIdOptions"
-                                :props="inventoryUnitIdProps">
+                                :style='{ "width": "100%" }' :options="productUnitList" :props="inventoryUnitIdProps">
                             </JnpfSelect>
-                            <!-- <JnpfSelect v-model="dataForm.inventoryUnitId" @change="changeData('inventoryUnitId', -1)"
-                                placeholder="请选择" :disabled="judgeWrite('inventoryUnitId')" clearable
-                                :style='{ "width": "100%" }' :options="dataForm.productUnitList"
-                                :props="inventoryUnitIdProps">
-                            </JnpfSelect> -->
                         </jnpf-form-tip-item>
                     </el-col>
                     <el-col :span="8" v-if="judgeShow('orderMainUnitId')">
                         <jnpf-form-tip-item label="订货单位" v-if="judgeShow('orderMainUnitId')" prop="orderMainUnitId">
                             <JnpfSelect v-model="dataForm.orderMainUnitId" @change="changeData('orderMainUnitId', -1)"
                                 placeholder="请选择" :disabled="judgeWrite('orderMainUnitId')" clearable
-                                :style='{ "width": "100%" }' :multiple="true" :options="orderMainUnitIdOptions"
+                                :style='{ "width": "100%" }' :multiple="true" :options="productUnitList"
                                 :props="orderMainUnitIdProps">
                             </JnpfSelect>
                         </jnpf-form-tip-item>
@@ -298,7 +291,7 @@
                         <jnpf-form-tip-item label="销售单位" v-if="judgeShow('salesMainUnitId')" prop="salesMainUnitId">
                             <JnpfSelect v-model="dataForm.salesMainUnitId" @change="changeData('salesMainUnitId', -1)"
                                 placeholder="请选择" :disabled="judgeWrite('salesMainUnitId')" clearable
-                                :style='{ "width": "100%" }' :multiple="true" :options="salesMainUnitIdOptions"
+                                :style='{ "width": "100%" }' :multiple="true" :options="productUnitList"
                                 :props="salesMainUnitIdProps">
                             </JnpfSelect>
                         </jnpf-form-tip-item>
@@ -307,7 +300,7 @@
                         <jnpf-form-tip-item label="操作单位" v-if="judgeShow('operateUnitId')" prop="operateUnitId">
                             <JnpfSelect v-model="dataForm.operateUnitId" @change="changeData('operateUnitId', -1)"
                                 placeholder="请选择" :disabled="judgeWrite('operateUnitId')" clearable
-                                :style='{ "width": "100%" }' :options="operateUnitIdOptions" :props="operateUnitIdProps">
+                                :style='{ "width": "100%" }' :options="productUnitList" :props="operateUnitIdProps">
                             </JnpfSelect>
                         </jnpf-form-tip-item>
                     </el-col>
@@ -315,7 +308,7 @@
                         <jnpf-form-tip-item label="计价单位" v-if="judgeShow('pricingUnitId')" prop="pricingUnitId">
                             <JnpfSelect v-model="dataForm.pricingUnitId" @change="changeData('pricingUnitId', -1)"
                                 placeholder="请选择" :disabled="judgeWrite('pricingUnitId')" clearable
-                                :style='{ "width": "100%" }' :options="pricingUnitIdOptions" :props="pricingUnitIdProps">
+                                :style='{ "width": "100%" }' :options="productUnitList" :props="pricingUnitIdProps">
                             </JnpfSelect>
                         </jnpf-form-tip-item>
                     </el-col>
@@ -445,6 +438,7 @@ import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
 import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
 import { thousandsFormat } from "@/components/Generator/utils/index"
 import dayjs from 'dayjs'
+import { arrayMax } from 'highcharts';
 export default {
     mixins: [comMixin],
     components: {},
@@ -761,8 +755,28 @@ export default {
             return this.setting.formOperates
         },
         productUnitList() {
-            console.log(this.dataForm)
-            return []
+            let arrA = this.dataForm.productUnitList.filter((x) => {
+                if (x.productUnitwarehouseId !== '') {
+                    return true
+                } else {
+                    return false
+                }
+            })
+            let arrB = arrA.map((x) => {
+                let fullNameA = x.productUnitwarehouseIdOptions.filter((x2) => {
+                    if (x2.id == x.productUnitwarehouseId) {
+                        return true
+                    } else {
+                        return false
+                    }
+                })
+                let obj = {
+                    id: x.productUnitCode,
+                    fullName: fullNameA[0].fullName
+                };
+                return obj;
+            })
+            return arrB
         }
     },
     watch: {},