修改物料清单页面

xjrsoft-vue3/src/api/jcsj/wlqd/model/WlqdModel.ts

@@ -6,7 +6,19 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
 export interface MesBaseBomPageParams extends BasicPageParams {
   bommc: string;
 
-  cpid: string;
+  bomsl: string;
+
+  bombb: string;
+
+  cpbh: string;
+
+  cpgg: string;
+
+  cpxh: string;
+
+  sfyy: string;
+
+  bz: string;
 }
 
 /**
@@ -17,7 +29,9 @@ export interface MesBaseBomPageModel {
 
   bommc: string;
 
-  cpmc: string;
+  bomsl: string;
+
+  bombb: string;
 
   cpbh: string;
 
@@ -25,9 +39,9 @@ export interface MesBaseBomPageModel {
 
   cpxh: string;
 
-  bomsl: string;
+  sfyy: string;
 
-  bombb: string;
+  bz: string;
 }
 
 /**

xjrsoft-vue3/src/views/jcsj/wlqd/components/WlqdModal.vue

@@ -148,7 +148,7 @@
   function customClick(item) {
     if (item.key == 'confirm') {
       handleSubmit();
-    } else if (item.key == 'cancel' && props.formType !== 'normal') {
+    } else if (item.key == 'cancel') {
       handleClose();
       closeModal(); 
     } else if (item.key == 'reset') {
@@ -163,4 +163,3 @@
   
 </script>
 
-  
\ No newline at end of file

xjrsoft-vue3/src/views/jcsj/wlqd/components/workflowPermission.ts

@@ -6,15 +6,14 @@ export const permissionList = [
     disabled: false,
     isSaveTable: false,
     tableName: '',
-    fieldName: '物料名称',
-    fieldId: 'bommc',
+    fieldName: '产品名称',
+    fieldId: 'cpid',
     isSubTable: false,
     showChildren: true,
-    type: 'input',
-    key: '0bb6edfef8ac486482e02a6e650306e6',
+    type: 'associate-popup',
+    key: 'c42ef62f38e1445b89e5c3362ffd3af2',
     children: [],
     options: {},
-    defaultValue: '',
   },
   {
     required: true,
@@ -23,7 +22,7 @@ export const permissionList = [
     disabled: false,
     isSaveTable: false,
     tableName: '',
-    fieldName: '物料数量',
+    fieldName: '产品数量',
     fieldId: 'bomsl',
     isSubTable: false,
     showChildren: true,
@@ -40,7 +39,7 @@ export const permissionList = [
     disabled: false,
     isSaveTable: false,
     tableName: '',
-    fieldName: '物料版本',
+    fieldName: 'BOM版本',
     fieldId: 'bombb',
     isSubTable: false,
     showChildren: true,
@@ -51,22 +50,6 @@ export const permissionList = [
     defaultValue: '',
   },
   {
-    required: true,
-    view: true,
-    edit: true,
-    disabled: false,
-    isSaveTable: false,
-    tableName: '',
-    fieldName: '产品',
-    fieldId: 'cpid',
-    isSubTable: false,
-    showChildren: true,
-    type: 'associate-popup',
-    key: 'c42ef62f38e1445b89e5c3362ffd3af2',
-    children: [],
-    options: {},
-  },
-  {
     required: false,
     view: true,
     edit: false,
@@ -90,23 +73,6 @@ export const permissionList = [
     disabled: false,
     isSaveTable: false,
     tableName: '',
-    fieldName: '产品名称',
-    fieldId: 'cpmc',
-    isSubTable: false,
-    showChildren: true,
-    type: 'input',
-    key: 'db0bea5c2dbf4505833e67179e8618f3',
-    children: [],
-    options: {},
-    defaultValue: '',
-  },
-  {
-    required: false,
-    view: true,
-    edit: false,
-    disabled: false,
-    isSaveTable: false,
-    tableName: '',
     fieldName: '产品规格',
     fieldId: 'cpgg',
     isSubTable: false,
@@ -158,6 +124,23 @@ export const permissionList = [
     disabled: false,
     isSaveTable: false,
     tableName: '',
+    fieldName: '产品名称',
+    fieldId: 'bommc',
+    isSubTable: false,
+    showChildren: true,
+    type: 'input',
+    key: 'b44ff861a87d45b5b264515d85935042',
+    children: [],
+    options: {},
+    defaultValue: '',
+  },
+  {
+    required: false,
+    view: true,
+    edit: true,
+    disabled: false,
+    isSaveTable: false,
+    tableName: '',
     fieldName: '备注',
     fieldId: 'bz',
     isSubTable: false,

xjrsoft-vue3/src/views/jcsj/wlqd/index.vue

@@ -24,7 +24,14 @@
           </template>
         </template>
         <template #bodyCell="{ column, record }">
-          
+          <template v-if="column.componentType === 'switch'">
+                  <a-switch
+                    v-model:checked="record[column.dataIndex]"
+                    :unCheckedValue="0"
+                    :checkedValue="1"
+                    :disabled="true"
+                  />
+                </template>
           
          
           <template v-if="column.dataIndex === 'action'">