【采购订单维护、采购需求单】流程单号：20240326124

1. 中台采购订单维护（增加显示厂家物料编码、物料备注）
2.中台采购采购需求单（在【单据详情】及【物料编码选择】界面增加显示物料备注）

src/components/PopDialog/index.vue

@@ -36,6 +36,9 @@
               <el-table-column prop="model" header-align="center" align="center" sortable="custom" min-width="90"
                 label="型号">
               </el-table-column>
+              <el-table-column prop="remark" header-align="center" align="center" sortable="custom" min-width="90"
+                label="物料备注">
+              </el-table-column>
               <el-table-column prop="manufacturerIdName" header-align="center" align="center" sortable="custom" min-width="90"
                 label="生产厂家">
               </el-table-column>

src/components/popover-select/components/MATERIAL_PARAM.js

@@ -1,6 +1,6 @@
 export default [
   {
-    item: { key: "code", title: "编码", width: "150" },
+    item: { key: "code", title: "编码", width: "140" },
     attr: {},
   },
   {
@@ -8,7 +8,11 @@ export default [
     attr: {},
   },
   {
-    item: { key: "specification", title: "规格", width: "150" },
+    item: { key: "specification", title: "规格", width: "120" },
+    attr: {},
+  },
+  {
+    item: { key: "remark", title: "物料备注", width: "150" },
     attr: {},
   },
   {
@@ -30,7 +34,7 @@ export default [
   {
     item: { key: "registrationNo", title: "注册证号", width: "160" },
     attr: {
-      type:'ComputedInput',
+      type: 'ComputedInput',
       formatter: (prop) => {
         return prop.materialMedcine != null ? prop.materialMedcine.registrationNo : null;
       },
@@ -39,7 +43,7 @@ export default [
   {
     item: { key: "isMedicineYN", title: "医药物料", width: "auto" },
     attr: {
-      type:'ComputedInput',
+      type: 'ComputedInput',
       formatter: (prop) => {
         return prop.isMedicine == "0" ? "Y" : "N";
       },
@@ -48,7 +52,7 @@ export default [
   {
     item: { key: "isDrug", title: "物料药品属性", width: "auto" },
     attr: {
-      type:'ComputedInput',
+      type: 'ComputedInput',
       formatter: (prop) => {
         return prop.isDrug == "0" ? "Y" : "N";
       },
@@ -57,7 +61,7 @@ export default [
   {
     item: { key: "isDrugNumber", title: "药品", width: "auto" },
     attr: {
-      type:'ComputedInput',
+      type: 'ComputedInput',
       formatter: (prop) => {
         return prop.materialMedcine != null ? prop.materialMedcine.isDrug : null;
       },
@@ -78,7 +82,7 @@ export default [
   {
     item: { key: "dosageFrom", title: "剂型", width: "auto" },
     attr: {
-      type:'ComputedInput',
+      type: 'ComputedInput',
       formatter: (prop) => {
         return prop.materialMedcine != null ? prop.materialMedcine.dosageFrom : null;
       },
@@ -87,7 +91,7 @@ export default [
   {
     item: { key: "dosageFromName", title: "剂型名称", width: "auto" },
     attr: {
-      type:'ComputedInput',
+      type: 'ComputedInput',
       formatter: (prop) => {
         return prop.materialMedcine != null ? prop.materialMedcine.dosageFromName : null;
       },
@@ -96,7 +100,7 @@ export default [
   {
     item: { key: "curingType", title: "养护类型", width: "auto" },
     attr: {
-      type:'ComputedInput',
+      type: 'ComputedInput',
       formatter: (prop) => {
         return prop.materialMedcine != null ? prop.materialMedcine.curingType : null;
       },
@@ -105,7 +109,7 @@ export default [
   {
     item: { key: "medicalInstruments", title: "医疗器械", width: "auto" },
     attr: {
-      type:'ComputedInput',
+      type: 'ComputedInput',
       formatter: (prop) => {
         return prop.materialMedcine != null ? prop.materialMedcine.medicalInstruments : null;
       },
@@ -114,7 +118,7 @@ export default [
   {
     item: { key: "ratifyBatchNo", title: "批准文号", width: "auto" },
     attr: {
-      type:'ComputedInput',
+      type: 'ComputedInput',
       formatter: (prop) => {
         return prop.materialMedcine != null ? prop.materialMedcine.ratifyBatchNo : null;
       },

src/views/purchase/PurchaseDemandList/add.vue

@@ -454,6 +454,13 @@
           />
           <ux-table-column
             resizable
+            title="物料备注"
+            align="center"
+            field="material_remark"
+            width="150px"
+          />
+          <ux-table-column
+            resizable
             title="单位"
             align="center"
             field="unitName"
@@ -1669,7 +1676,7 @@ export default {
         }
       } catch (error) {}
     },
-   
+
     // 改变需求计划改变需求日期
     changeplanType(val) {
       this.dafaultDate();
@@ -1872,6 +1879,7 @@ export default {
       }
     },
     async save() {
+      console.log(this.basicForm, "this.basicForm");
       if (this.basicForm.puDemandItemList.length !== 0) {
         this.$refs["basic"].validate((valid, obj) => {
           if (valid) {
@@ -2705,6 +2713,9 @@ export default {
               res.rows[0].buyerName;
           }
         });
+        // 2024.03.29 增加物料备注
+        this.basicForm.puDemandItemList[this.tableIndex].material_remark =
+          selection[0].remark;
         this.basicForm.puDemandItemList[this.tableIndex].materialCode =
           selection[0].code;
         this.basicForm.puDemandItemList[this.tableIndex].material =
@@ -2805,6 +2816,8 @@ export default {
           // 物料存储条件和运输条件
           line.transportationCondition = selection[i].transportationCondition;
           line.storageCondition = selection[i].storageCondition;
+          // 2024.03.29 增加物料备注
+          line.material_remark = selection[i].remark;
           // this.basicForm.puDemandItemList.push(line)
           newLine.push(line);
         }

src/views/purchase/purchase-order/add/column.js

@@ -410,7 +410,6 @@ const PurchaseTabColumns = [
         disabled: true,
         require: false,
       },
-
       {
         key: "materialCode",
         title: "物料编码",
@@ -442,13 +441,21 @@ const PurchaseTabColumns = [
           registration: 'registrationNo',
           isDrug: 'isDrug',
           rateCode: "materialRateName",
+          materialManufacturersCode: "materialManufacturersCode",
+          material_remark: "remark",
         },
         queryParams: () => ({}),
         width: 180,
       },
       {
-        // key: "materialCode",
-        // title: "物料编码",
+        key: "materialManufacturersCode",
+        title: "厂家物料编码",
+        inputType: "Input",
+        width: 180,
+        disabled: true,
+        readonly: true,
+      },
+      {
         key: "materialName",
         title: "物料名称",
         inputType: "Input",
@@ -457,7 +464,7 @@ const PurchaseTabColumns = [
         disabled: true,
         readonly: true,
       },
-      { //specification
+      {
         key: "specification",
         title: "规格",
         inputType: "Input",
@@ -465,13 +472,21 @@ const PurchaseTabColumns = [
         disabled: true,
         readonly: true,
       },
-      { //model
+      {
         key: "model",
         title: "型号",
         inputType: "Input",
         disabled: true,
         readonly: true,
       },
+      {
+        key: "material_remark",
+        title: "物料备注",
+        inputType: "Input",
+        disabled: true,
+        width: 180,
+        readonly: true,
+      },
       { // manufacturerId  manufacturerIdName
         key: "manufacturerName",
         title: "生产厂家代理人",
@@ -1224,7 +1239,6 @@ const CauseTabColumns = [
         disabled: true,
         require: false,
       },
-
       {
         key: "materialCode",
         title: "物料编码",
@@ -1256,10 +1270,20 @@ const CauseTabColumns = [
           registration: 'registrationNo',
           isDrug: 'isDrug',
           rateCode: "materialRateName",
+          materialManufacturersCode: "materialManufacturersCode",
+          material_remark: "remark",
         },
         queryParams: () => ({}),
       },
       {
+        key: "materialManufacturersCode",
+        title: "厂家物料编码",
+        inputType: "Input",
+        width: 180,
+        disabled: true,
+        readonly: true,
+      },
+      {
         key: "materialName",
         title: "物料名称",
         inputType: "Input",
@@ -1268,7 +1292,7 @@ const CauseTabColumns = [
         disabled: true,
         readonly: true,
       },
-      { //specification
+      {
         key: "specification",
         title: "规格",
         inputType: "Input",
@@ -1276,13 +1300,21 @@ const CauseTabColumns = [
         disabled: true,
         readonly: true,
       },
-      { //model
+      {
         key: "model",
         title: "型号",
         inputType: "Input",
         disabled: true,
         readonly: true,
       },
+      {
+        key: "material_remark",
+        title: "物料备注",
+        inputType: "Input",
+        disabled: true,
+        readonly: true,
+        width: 180,
+      },
       { //isMedicine  isMedicineValue
         key: "isMedcine",
         title: "医药物料",

src/views/purchase/purchase-order/add/index.vue

@@ -293,7 +293,7 @@ export default {
           ).tableColumns;
 
           let rowData = initParams(arr, "key", "value");
-          console.log(rowData, "rowData");
+          // console.log(rowData, "rowData");
 
           "rowno" in rowData &&
             (rowData["rowno"] = this.params[key].length
@@ -643,7 +643,7 @@ export default {
         source.deliveryDate = new Date(
           new Date(params.createTime).getTime() + DPtime
         ).Format("yyyy-MM-dd HH:mm:ss");
-        
+
         try {
           // try
           this.loading = true;

src/views/purchase/purchase-order/column.js

@@ -838,7 +838,12 @@ const PurTabColumns = [
         attr: {
           isHidden: true,
         },
-
+      },
+      {
+        item: { key: "materialManufacturersCode", title: "厂家物料编码", width: 150, },
+        attr: {
+          isHidden: true,
+        },
       },
       {
         item: { key: "materialName", title: "物料名称", width: 150, },
@@ -861,6 +866,12 @@ const PurTabColumns = [
         },
       },
       {
+        item: { key: "material_remark", title: "物料备注", width: 180, },
+        attr: {
+          isHidden: true,
+        },
+      },
+      {
         item: { key: "manufacturerName", title: "生产厂家代理人", width: 150, },
         attr: {
           isHidden: true,
@@ -1188,25 +1199,28 @@ const CommonTabColumns = [
       },
       // { item:{key: "materialClassify", title: "物料分类",  },},
       {
-        item: { key: "materialManufacturersCode", title: "厂家物料编码", width: 100, },
+        item: { key: "materialManufacturersCode", title: "厂家物料编码", width: 150, },
         attr: {
           isHidden: true,
         },
-
       },
       {
         item: { key: "specification", title: "规格", width: 100, },
         attr: {
           isHidden: true,
         },
-
       },
       {
         item: { key: "model", title: "型号", width: 100 },
         attr: {
           isHidden: true,
         },
-
+      },
+      {
+        item: { key: "material_remark", title: "物料备注", width: 180, },
+        attr: {
+          isHidden: true,
+        },
       },
       {
         item: { key: "customerName", title: "收货客户", width: 100, },