Browse Source

修改审批配置节点

jingbb 2 months ago
parent
commit
d0041e6763

+ 7 - 6
src/views/system/approvalProcessConfig/approvalProcessConfigForm.data.ts

@@ -4,12 +4,13 @@ import { rules} from '/@/utils/helper/validator';
 import { render } from '/@/utils/common/renderUtils';
 import {JVxeTypes,JVxeColumn} from '/@/components/jeecg/JVxeTable/types'
 import { getWeekMonthQuarterYear } from '/@/utils';
+import { defHttp } from '/@/utils/http/axios';
 //列表数据
 export const columns: BasicColumn[] = [
    {
-    title: '表单名称(table name)',
+    title: '表单(table id)',
     align:"center",
-    dataIndex: 'tableName'
+    dataIndex: 'tableId'
    },     
    {
     title: '是否启用(status)',
@@ -17,9 +18,9 @@ export const columns: BasicColumn[] = [
     dataIndex: 'status'
    },
    {
-    title: '描述(customer)',
+    title: '描述(tableName)',
     align:"center",
-    dataIndex: 'customerName'
+    dataIndex: 'tableName'
    }
 ];
 
@@ -67,8 +68,8 @@ export const SonTableColumns: JVxeColumn[] = [
       defaultValue:'1',
     },
     {
-      title: '审批说明(describe)',
-      key: 'describe',
+      title: '审批说明(notes)',
+      key: 'notes',
       type: JVxeTypes.input,
       placeholder: '请输入${title}',
       defaultValue:'',

+ 30 - 8
src/views/system/approvalProcessConfig/components/approvalProcessConfigForm.vue

@@ -59,10 +59,25 @@
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"
+          
           asyncRemove
         >
+        <!-- @value-change="changeValues" -->
+           <!-- <template #approverIdSlot="props" >
+            <ApiSelect
+                  :api="SaleManOption"
+                  showSearch
+                  v-model:value="props.row.approverId"
+                  :filterOption="true"
+                  resultField="records"
+                  labelField="realname"
+                  valueField="username"
+                  :params="{ pageSize: -1 }"
+                  optionFilterProp="label"
+                />
+          </template> -->
           <template #action="props">
-            <a-popconfirm title="确定删除吗?" @confirm="handleDelete1(props)">
+            <a-popconfirm title="确定删除吗?" @confirm="changeValues(props)">
               <a>删除(delete)</a>
             </a-popconfirm>
           </template>
@@ -76,7 +91,7 @@
   import { defineComponent, ref, reactive, computed, toRaw, onMounted } from 'vue';
   import { defHttp } from '/@/utils/http/axios';
   import { useValidateAntFormAndTable } from '/@/hooks/system/useJvxeMethods';
-  import {querySonTable,queryDataById,saveOrUpdate, queryDeliverDataById} from '..approvalProcessConfigForm.api';
+  import {querySonTable,queryDataById,saveOrUpdate, queryDeliverDataById,SaleManOption} from '../approvalProcessConfigForm.api';
   import { JVxeTable } from '/@/components/jeecg/JVxeTable';
   import { SonTableColumns } from '../approvalProcessConfigForm.data';
   import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
@@ -231,11 +246,13 @@
         formData[key] = value;
       }
       //产品明细-删除行
-      async function handleDelete1(prop) {
-        var xTable = approvalProcessConfigFormTableRef.value!.getXTable();
-        var newArray = [...xTable.data];
-        newArray.splice(prop.rowIndex, 1);
-        approvalProcessConfigFormTable.dataSource = newArray;
+      async function handleDelete1({row}) {
+        approvalProcessConfigFormTableRef.value?.removeRows(row)    
+      }
+      async function changeValues(prop) {
+        if (prop.col.key == 'approverId') {
+          var obj = await SaleManOption({username:prop.row.approverId })
+        }
       }
       return {
         approvalProcessConfigFormTableRef,
@@ -254,7 +271,9 @@
         add,
         edit,
         formRef,
-        handleDelete1
+        handleDelete1,
+        SaleManOption,
+        changeValues
       };
     },
   });
@@ -282,4 +301,7 @@
     color: white !important;
     background-color: white !important;
   }
+  /deep/.ant-select{
+    width: 100% !important;
+  }
 </style>