显示部门和单位

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

@@ -850,7 +850,7 @@ export default {
       deliveryTypeProps: { "label": "fullName", "value": "id" },
       voucherTypeOptions: [{ "fullName": "磅单", "id": "1" }, { "fullName": "收据", "id": "2" }, { "fullName": "其他", "id": "3" }],
       voucherTypeProps: { "label": "fullName", "value": "id" },
-      associateThirdSupplierscolumnOptions: [{ "label": "供应商名称", "value": "name" }, { "label": "国家", "value": "country" }, { "label": "地址", "value": "address" }, { "label": "电话", "value": "phone" }],
+      associateThirdSupplierscolumnOptions: [{ "label": "供应商名称", "value": "name" }, { "label": "国家", "value": "country" }, { "label": "地址", "value": "address" }, { "label": "电话", "value": "phone" }, { "label": "所属部门", "value": "departmentName" }],
       modeTransportOptions: [{ "fullName": "公路", "id": "1" }, { "fullName": "铁路", "id": "2" }, { "fullName": "轮船", "id": "3" }, { "fullName": "空运", "id": "4" }, { "fullName": "无", "id": "5" }],
       modeTransportProps: { "label": "fullName", "value": "id" },
       transportationMethodOptions: [{ "fullName": "仓库承运(DC)", "id": "1" }, { "fullName": "承运商", "id": "2" }, { "fullName": "供应商", "id": "3" }, { "fullName": "自提", "id": "4" }],
@@ -859,10 +859,10 @@ export default {
       voucherStatusProps: { "label": "fullName", "value": "id" },
       documentTypeOptions: [{ "fullName": "收货凭证", "id": "1" }, { "fullName": "发货凭证", "id": "2" }],
       documentTypeProps: { "label": "fullName", "value": "id" },
-      voucherproductproductIdcolumnOptions: [{ "label": "商品编码", "value": "code" }, { "label": "商品名称", "value": "name" }, { "label": "商品简称", "value": "short_name" }, { "label": "规格", "value": "spec" }, { "label": "商品条码", "value": "bar_code" }, { "label": "存货类型", "value": "inventoryType" }],
+      voucherproductproductIdcolumnOptions: [{ "label": "商品编码", "value": "code" }, { "label": "商品名称", "value": "name" }, { "label": "单位", "value": "unitName" }, { "label": "商品简称", "value": "short_name" }, { "label": "规格", "value": "spec" }, { "label": "商品条码", "value": "bar_code" }, { "label": "存货类型", "value": "inventoryType" }],
       vouchervehiclevehicleIdcolumnOptions: [{ "label": "车牌号", "value": "vehicle_number" }, { "label": "驾驶员", "value": "driverName" }, { "label": "电话", "value": "driverMobile" },],
       enterpriseIdcolumnOptions: [{ "label": "机构编码", "value": "f_en_code" }, { "label": "机构名称", "value": "f_full_name" },],
-      firstSubjectBasicIdcolumnOptions: [{ "label": "供应商名称", "value": "name" }, { "label": "国家", "value": "country" }, { "label": "地址", "value": "address" }, { "label": "电话", "value": "phone" }],
+      firstSubjectBasicIdcolumnOptions: [{ "label": "供应商名称", "value": "name" }, { "label": "所属部门", "value": "departmentName" }, { "label": "地址", "value": "address" }, { "label": "电话", "value": "phone" }],
       deliveryproductrelationdeliveryUnitOptions: [{ fullName: "吨", id: "1" }, { fullName: "千克", id: "2" }],
       deliveryproductrelationdeliveryUnitProps: { label: "fullName", value: "id" },
       contractColumnOptions: [{ "label": "合同类型", "value": "contractType" }, { "label": "合同编码", "value": "contract_number" }, { "label": "合同名称", "value": "contract_name" }, { "label": "合同简称", "value": "contract_short_name" }],

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

@@ -820,10 +820,10 @@ export default {
       voucherStatusProps: { "label": "fullName", "value": "id" },
       documentTypeOptions: [{ "fullName": "收货凭证", "id": "1" }, { "fullName": "发货凭证", "id": "2" }],
       documentTypeProps: { "label": "fullName", "value": "id" },
-      voucherproductproductIdcolumnOptions: [{ "label": "商品编码", "value": "code" }, { "label": "商品名称", "value": "name" }, { "label": "商品简称", "value": "short_name" }, { "label": "规格", "value": "spec" }, { "label": "商品条码", "value": "bar_code" }, { "label": "存货类型", "value": "inventoryType" }],
+      voucherproductproductIdcolumnOptions: [{ "label": "商品编码", "value": "code" }, { "label": "商品名称", "value": "name" }, { "label": "单位", "value": "unitName" }, { "label": "商品简称", "value": "short_name" }, { "label": "规格", "value": "spec" }, { "label": "商品条码", "value": "bar_code" }, { "label": "存货类型", "value": "inventoryType" }],
       vouchervehiclevehicleIdcolumnOptions: [{ "label": "车牌号", "value": "vehicle_number" }, { "label": "驾驶员", "value": "driverName" }, { "label": "电话", "value": "driverMobile" },],
       enterpriseIdcolumnOptions: [{ "label": "机构编码", "value": "f_en_code" }, { "label": "机构名称", "value": "f_full_name" },],
-      firstSubjectBasicIdcolumnOptions: [{ "label": "客户名称", "value": "name" }, { "label": "国家", "value": "country" }, { "label": "地址", "value": "address" }, { "label": "电话", "value": "phone" }],
+      firstSubjectBasicIdcolumnOptions: [{ "label": "客户名称", "value": "name" }, { "label": "地址", "value": "address" }, { "label": "电话", "value": "phone" }],
       deliveryproductrelationdeliveryUnitOptions: [{ fullName: "吨", id: "1" }, { fullName: "千克", id: "2" }],
       deliveryproductrelationdeliveryUnitProps: { label: "fullName", value: "id" },
       childIndex: -1,

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

@@ -1238,10 +1238,8 @@ export default {
       }
 
       if (this.dataForm.workOrderPrimaryList1.length == 0) {
-        this.$alert('请先选择BOM', {
-          confirmButtonText: '确定',
-        });
-        this.dataForm.workOrderProductList[index].planNum = undefined
+
+        // this.dataForm.workOrderProductList[index].planNum = undefined
       } else if (val == 0) {
         this.dataForm.workOrderPrimaryList1.filter((item) => {
           item.itemsnum = this.jnpf.floatMul(item.theoryNum, 1)