🐞 fix(【物料申请单、物料变更单、采购订单维护、采购需求单】): 中台对于新品并无任何流程校验环节

OA的【新供应商/新产品申请流程】在采购员处理完之后，出现长期未审批通过（2个月），但是采购员并不知情，不知道流程并未至最终的审批通过节点，业务员虽为发起人，但是未将流程跟进至结束节点就提起了采购需求，采购员按时处理了需求转订单流程，中台对于新品并无任何流程校验环节，是否是新品、是否提了对应的新品流程、流程是否通过？全靠人为把关，导致出现未按流程顺序开展工作的情况，

20240522027 -v1

src/components/super-form/index.vue

@@ -127,10 +127,11 @@ export default {
                 :title="item.title"
                 v-model="innerValue[item.key]"
                 :source.sync="innerValue"
-                :disabled="$attrs.disabled"
+                :disabled="$attrs.disabled || attr.disabled"
                 style="width: 100%"
               >
               </component>
+
               <component
                 v-else-if="attr.is === 'el-popover-multiple-select-v2'"
                 v-bind="attr"

src/views/material/changeApply/add/column.js

@@ -1,40 +1,40 @@
-export default function useColumns(){
+export default function useColumns() {
 
   const TableColumns = [
     {
-      item:{
-        key:'code',
-        title:'单据编码',
+      item: {
+        key: 'code',
+        title: '单据编码',
       },
-      attr:{
+      attr: {
         is: "el-input",
-        disabled:true,
+        disabled: true,
       },
     },
     {
-      item:{
-        key:'orgName',
-        title:'所属组织',
+      item: {
+        key: 'orgName',
+        title: '所属组织',
       },
-      attr:{
+      attr: {
         is: "el-popover-select-v2",
         valueKey: "name",
         referName: "ORG_PARAM",
         dataMapping: {
-          orgId:'id'
+          orgId: 'id'
         },
-        disabled:true,
+        disabled: true,
       },
     },
     {
-      item:{
-        key:'status',
-        title:'单据状态',
+      item: {
+        key: 'status',
+        title: '单据状态',
       },
-      attr:{
+      attr: {
         is: "el-select",
         dictName: "documents_status", // 字典名
-        disabled:true,
+        disabled: true,
       },
     },
     // {
@@ -49,60 +49,60 @@ export default function useColumns(){
 
     // },
     {
-      item:{
-        key:'applicationTime',
-        title:'申请时间',
+      item: {
+        key: 'applicationTime',
+        title: '申请时间',
       },
-      attr:{
+      attr: {
         is: "el-date-picker",
         valueFormat: "yyyy-MM-dd HH:mm:ss",
-        disabled:true,
+        disabled: true,
       },
 
     },
     {
-      item:{
-        key:'createByName',
-        title:'创建人',
+      item: {
+        key: 'createByName',
+        title: '创建人',
       },
-      attr:{
+      attr: {
         is: "el-input",
-        disabled:true,
+        disabled: true,
       },
 
     },
     {
-      item:{
-        key:'createTime',
-        title:'创建时间',
+      item: {
+        key: 'createTime',
+        title: '创建时间',
       },
-      attr:{
+      attr: {
         is: "el-date-picker",
         valueFormat: "yyyy-MM-dd HH:mm:ss",
-        disabled:true,
+        disabled: true,
       },
 
     },
     {
-      item:{
-        key:'updateByName',
-        title:'最后修改人',
+      item: {
+        key: 'updateByName',
+        title: '最后修改人',
       },
-      attr:{
+      attr: {
         is: "el-input",
-        disabled:true,
+        disabled: true,
       },
 
     },
     {
-      item:{
-        key:'updateTime',
-        title:'最后修改时间',
+      item: {
+        key: 'updateTime',
+        title: '最后修改时间',
       },
-      attr:{
+      attr: {
         is: "el-date-picker",
         valueFormat: "yyyy-MM-dd HH:mm:ss",
-        disabled:true,
+        disabled: true,
       },
 
     },
@@ -114,21 +114,21 @@ export default function useColumns(){
 
   const TabColumns = [
     {
-      item:{
-        key:'materialBasic',
-        title:'物料信息',
+      item: {
+        key: 'materialBasic',
+        title: '物料信息',
       },
-      attr:{
-        value:[]
+      attr: {
+        value: []
       },
-      TableColumns:[
+      TableColumns: [
         {
-          item:{
-            key:'materialCode',
-            title:'物料编码',
+          item: {
+            key: 'materialCode',
+            title: '物料编码',
             require: true,
           },
-          attr:{
+          attr: {
             // readonly:true,
             is: "el-popover-select-v2",
             valueKey: "code",
@@ -137,35 +137,35 @@ export default function useColumns(){
               materialId: "id",
               materialCode: "code",
               materialName: "name",
-              diCode:'diCode',
-              remark:'remark',
+              diCode: 'diCode',
+              remark: 'remark',
               model: "model",
-              materialClassifyId:'classifyId',
-              productionPermit:'productionPermit',
+              materialClassifyId: 'classifyId',
+              productionPermit: 'productionPermit',
               specification: "specification",
-              storageConditions:'storageCondition',
-              transportCondition:'transportationCondition',
-              medicineMaterial:'isMedicine',
-              factory:'manufacturerId',
-              factoryName:'manufacturerIdName',
-              registrant:'registrant',
-              oneClass:'oneClass',
-              twoClass:'twoClass',
-              threeClass:'threeClass',
-              fourClass:'fourClass',
-              drug:'isDrugNumber',
-              registrationNo:'registrationNo',
-              dosageFrom:'dosageFrom',
+              storageConditions: 'storageCondition',
+              transportCondition: 'transportationCondition',
+              medicineMaterial: 'isMedicine',
+              factory: 'manufacturerId',
+              factoryName: 'manufacturerIdName',
+              registrant: 'registrant',
+              oneClass: 'oneClass',
+              twoClass: 'twoClass',
+              threeClass: 'threeClass',
+              fourClass: 'fourClass',
+              drug: 'isDrugNumber',
+              registrationNo: 'registrationNo',
+              dosageFrom: 'dosageFrom',
               // dosageFromName:'dosageFromName',
-              maintenanceType:'curingType',
-              medicalDevices:'medicalInstruments',
-              leadTime:'deliveryPeriod',
-              isInventoryStatus:'isInventoryStatus',
-              expiryDateManagerment:'expiryDateManagerment',
-              usefulLife:'usefulLife',
-              serialNoManager:'serialNoManager',
-              ratifyBatchNo:'ratifyBatchNo',
-              expiryUnitId:'expiryUnitId',
+              maintenanceType: 'curingType',
+              medicalDevices: 'medicalInstruments',
+              leadTime: 'deliveryPeriod',
+              isInventoryStatus: 'isInventoryStatus',
+              expiryDateManagerment: 'expiryDateManagerment',
+              usefulLife: 'usefulLife',
+              serialNoManager: 'serialNoManager',
+              ratifyBatchNo: 'ratifyBatchNo',
+              expiryUnitId: 'expiryUnitId',
               usefulLifeUnitId: 'usefulLifeUnitId',
               recentWarningPeriod: 'recentWarningPeriod',
               nearOnsetManagerment: 'nearOnsetManagerment',
@@ -176,107 +176,111 @@ export default function useColumns(){
 
         },
         {
-          item:{
-            key:'materialName',
-            title:'物料名称',
+          item: {
+            key: 'materialName',
+            title: '物料名称',
             require: true,
           },
-          attr:{
+          attr: {
             is: "el-input",
             // disabled:true,
           },
 
         },
         {
-          item:{
-            key:'medicineMaterial',
-            title:'医药物料',
+          item: {
+            key: 'medicineMaterial',
+            title: '医药物料',
           },
-          attr:{
+          attr: {
             is: "el-select",
             dictName: "sys_number_yes_no", // 字典名
           },
 
         },
         {
-          item:{
-            key:'productionPermit',
-            title:'生产许可证',
+          item: {
+            key: 'productionPermit',
+            title: '生产许可证',
           },
-          attr:{
+          attr: {
             is: "el-input",
           },
 
         },
         {
-          item:{
-            key:'specification',
-            title:'规格',
+          item: {
+            key: 'specification',
+            title: '规格',
             require: true,
           },
-          attr:{
+          attr: {
             is: "el-input",
-            maxlength:150,
+            maxlength: 150,
           },
 
 
         },
         {
-          item:{
-            key:'model',
-            title:'型号',
+          item: {
+            key: 'model',
+            title: '型号',
           },
-          attr:{
+          attr: {
             is: "el-input",
           },
 
         },
-       
+
         {
-          item:{
-            key:'factoryName',
-            title:'生产厂家/代理人',
+          item: {
+            key: 'factoryName',
+            title: '生产厂家/代理人',
             require: true,
           },
-          attr:{
+          attr: {
             is: "el-popover-select-v2",
             valueKey: "name",
             referName: "MANUFACTURER_PARAM",
             dataMapping: {
-              factory:'id'
+              factory: 'id',
+              // brand: "brand", // 品牌
+              // originPlace: "country", // 产地
+              // originPlaceName: "countryName",
+              // productionPermit: "productionLicense", // 生产许可证
             }
           },
 
         },
         {
-          item:{
-            key:'registrant',
-            title:'注册人/备案人/上市许可持有人',
+          item: {
+            key: 'registrant',
+            title: '注册人/备案人/上市许可持有人',
             require: true,
           },
-          attr:{
+          attr: {
             is: "el-input",
           },
 
         },
         {
-          item:{
-            key:'storageConditions',
-            title:'存储条件',
+          item: {
+            key: 'storageConditions',
+            title: '存储条件',
             require: true,
           },
-          attr:{
+          attr: {
             is: "el-select",
             dictName: "sys_storage_condition", // 字典名
           },
 
         },
         {
-          item:{
-            key:'transportCondition',
-            title:'运输条件',
+          item: {
+            key: 'transportCondition',
+            title: '运输条件',
           },
-          attr:{
+          attr: {
             is: "el-select",
             dictName: "sys_conditions_carriage", // 字典名
           },
@@ -295,85 +299,85 @@ export default function useColumns(){
 
         // },
         {
-          item:{
-            key:'isInventoryStatus',
-            title:'批号及库存状态管理',
+          item: {
+            key: 'isInventoryStatus',
+            title: '批号及库存状态管理',
           },
-          attr:{
+          attr: {
             is: "el-select",
             dictName: "sys_number_yes_no", // 字典名
           },
         },
         {
-          item:{
-            key:'expiryDateManagerment',
-            title:'效期管理',
+          item: {
+            key: 'expiryDateManagerment',
+            title: '效期管理',
           },
-          attr:{
+          attr: {
             is: "el-select",
             dictName: "sys_number_yes_no", // 字典名
           },
         },
         {
-          item:{
-            key:'serialNoManager',
-            title:'是否序列号管理',
+          item: {
+            key: 'serialNoManager',
+            title: '是否序列号管理',
           },
-          attr:{
+          attr: {
             is: "el-select",
             dictName: "sys_number_yes_no", // 字典名
           },
         },
         {
-          item:{
-            key:'usefulLife',
-            title:'有效期',
+          item: {
+            key: 'usefulLife',
+            title: '有效期',
           },
-          attr:{
+          attr: {
             is: "el-input-number",
-            controlsPosition:"right",
-            min:0,
+            controlsPosition: "right",
+            min: 0,
           },
         },
         {
-          item:{
-            key:'expiryUnitId',
-            title:'效期单位',
+          item: {
+            key: 'expiryUnitId',
+            title: '效期单位',
           },
-          attr:{
+          attr: {
             is: "el-select",
             dictName: "period_unit",
             clearable: true,
           },
         },
         {
-          item:{
-            key:'usefulLifeUnitId',
-            title:'有效期至单位',
+          item: {
+            key: 'usefulLifeUnitId',
+            title: '有效期至单位',
           },
-          attr:{
+          attr: {
             is: "el-select",
             dictName: "expiry_date",
             clearable: true,
           },
         },
         {
-          item:{
-            key:'nearOnsetManagerment',
-            title:'近效期管理',
+          item: {
+            key: 'nearOnsetManagerment',
+            title: '近效期管理',
           },
-          attr:{
+          attr: {
             is: "el-select",
             dictName: "sys_number_yes_no",
-            clearable:true,
+            clearable: true,
           },
         },
         {
-          item:{
-            key:'recentWarningPeriod',
-            title:'近效期预警天数',
+          item: {
+            key: 'recentWarningPeriod',
+            title: '近效期预警天数',
           },
-          attr:{
+          attr: {
             is: "el-input-number",
             min: 0,
             controlsPosition: "right",
@@ -402,98 +406,98 @@ export default function useColumns(){
 
         // },
         {
-          item:{
-            key:'oneClass',
-            title:'一级分类',
+          item: {
+            key: 'oneClass',
+            title: '一级分类',
           },
-          attr:{
+          attr: {
             is: "el-input",
-            disabled:true,
+            disabled: true,
           },
 
         },
         {
-          item:{
-            key:'twoClass',
-            title:'二级分类',
+          item: {
+            key: 'twoClass',
+            title: '二级分类',
           },
-          attr:{
+          attr: {
             is: "el-input",
-            disabled:true,
+            disabled: true,
           },
 
         },
         {
-          item:{
-            key:'threeClass',
-            title:'三级分类',
+          item: {
+            key: 'threeClass',
+            title: '三级分类',
           },
-          attr:{
+          attr: {
             is: "el-input",
-            disabled:true,
+            disabled: true,
           },
 
         },
         {
-          item:{
-            key:'fourClass',
-            title:'四级分类',
+          item: {
+            key: 'fourClass',
+            title: '四级分类',
           },
-          attr:{
+          attr: {
             is: "el-input",
-            disabled:true,
+            disabled: true,
           },
 
         },
         {
-          item:{
-            key:'drug',
-            title:'药品',
+          item: {
+            key: 'drug',
+            title: '药品',
           },
-          attr:{
+          attr: {
             is: "el-select",
             dictName: "sys_medicine", // 字典名
           },
 
         },
         {
-          item:{
-            key:'ratifyBatchNo',
-            title:'批准文号',
+          item: {
+            key: 'ratifyBatchNo',
+            title: '批准文号',
           },
-          attr:{
+          attr: {
             is: "el-input",
           },
 
         },
         {
-          item:{
-            key:'registrationNo',
-            title:'注册证号/备案凭证编号',
+          item: {
+            key: 'registrationNo',
+            title: '注册证号/备案凭证编号',
           },
-          attr:{
+          attr: {
             is: "el-input",
           },
 
         },
         {
-          item:{
-            key:'medicalDevices',
+          item: {
+            key: 'medicalDevices',
             // title:'医疗器械',
-            title:'管理类别',
+            title: '管理类别',
           },
-          attr:{
+          attr: {
             is: "el-select",
             dictName: "medical_instruments", // 字典名
           },
 
         },
         {
-          item:{
-            key:'maintenanceType',
-            title:'养护类型',
+          item: {
+            key: 'maintenanceType',
+            title: '养护类型',
           },
-          attr:{
+          attr: {
             is: "el-select",
             dictName: "curing_type", // 字典名
           },
@@ -519,6 +523,6 @@ export default function useColumns(){
     },
   ]
 
-  return {TableColumns,TabColumns}
+  return { TableColumns, TabColumns }
 }
 

src/views/material/requisition/details/columns.js

@@ -446,8 +446,7 @@ export default function useColumns() {
             dataMapping: {
               originPlace: 'id'
             },
-            readonly: true,
-            // disabled: true,
+            disabled: true,
           },
 
         },

src/views/purchase/PurchaseDemandList/add.vue

@@ -209,6 +209,19 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="1.5">
+            <el-form-item label="OA新品单号">
+              <el-input
+                v-model="basicForm.newProductCode"
+                :size="size"
+                :disabled="sonDisable"
+                placeholder="填写OA新品/新供应商单据号"
+                clearable
+                style="width: 200px"
+              />
+            </el-form-item>
+          </el-col>
+
           <!-- <el-col :span="1.5">
             <el-form-item label="需求客户名称">
               <el-input disabled v-model="basicForm.customerName" :size="size" style="width: 200px"></el-input>
@@ -1446,6 +1459,7 @@ export default {
         isMonthleyCalculate: "",
         createTime: this.parseTime(new Date().getTime()),
         remark: "",
+        newProductCode: null,
         puDemandItemList: [],
       },
       delDemandItemList: [],

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

@@ -343,7 +343,13 @@ const PurColumns = [
     title: "OA需求单号",
     inputType: "Input",
     isShow: true,
-
+  },
+  {
+    key: "newProductCode",
+    title: "OA新品流程单据号",
+    inputType: "Input",
+    // placeholder: "",
+    isShow: true,
   },
 
   {
@@ -1179,7 +1185,13 @@ const CauseColumns = [
     title: "OA需求单号",
     inputType: "Input",
     isShow: true,
-
+  },
+  {
+    key: "newProductCode",
+    title: "OA新品流程单据号",
+    inputType: "Input",
+    // placeholder: "",
+    isShow: true,
   },
   {
     key: "remark",