佣金合同-增加关闭按钮/佣金比例字段

src/views/platformBusiness/commissionContract/commissionContract.vue

@@ -71,6 +71,7 @@
         >
         <a-button type="primary" @click="submit"> 提交(submit)</a-button>
         <a-button type="primary" @click="cancelSubmit"> 取消提交(cancelSubmit)</a-button>
+        <a-button type="primary" @click="handleClose"> 关闭(Close)</a-button>
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
             <a-menu>
@@ -112,7 +113,8 @@
     getExportUrl,
     batchSubmit,
     cancelBatchSubmit,
-    supplierOption
+    supplierOption,
+    batchClose,
   } from './commissionContractForm.api';
   import { cloneDeep } from 'lodash-es';
   import { JDictSelectTag, JInput ,JSelect} from '/@/components/Form';
@@ -260,8 +262,14 @@
       cancelBatchSubmit({ ids: ids }, handleSuccess);
     }
   }
-
-
+  function handleClose(){
+    if (selectedRowKeys.value.length == 0) {
+      message.warning('请选择数据');
+    } else {
+      var ids = selectedRowKeys.value.join(',');
+      batchClose({ ids: ids }, handleSuccess);
+    }
+  }
   /* ----------------------以下为原生查询需要添加的-------------------------- */
   const toggleSearchStatus = ref<boolean>(false);
   const labelCol = reactive({

src/views/platformBusiness/commissionContract/commissionContractForm.api.ts

@@ -15,6 +15,7 @@ enum Api {
   productList = '/platCode/platCommissionContract/queryPlatCommissionContractProductByMainId',
   submitBatch='/platCode/platCommissionContract/submitBatch',
   cancelSubmitBatch='/platCode/platCommissionContract/returnSubmitBatch',
+  closeBatch='/platCode/platCommissionContract/submitClose',
   supplierList='/cuspCode/cuspSupplierProfile/list?pageSize=-1',
 }
 /**
@@ -108,6 +109,20 @@ export const cancelBatchSubmit = (params, handleSuccess) => {
     }
   });
 }
-
+//关闭
+export const batchClose = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认关闭',
+    content: '是否关闭选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.get({url: Api.closeBatch, params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
 //获取供应商列表
 export const supplierOption = (params) => defHttp.get({url: Api.supplierList, params});

src/views/platformBusiness/commissionContract/components/commissionContractFormForm.vue

@@ -45,6 +45,11 @@
                 <a-input v-model:value="formData.salesmanName" placeholder="请输入采购员(salesman)" allow-clear disabled />
               </a-form-item>
             </a-col>
+            <a-col :span="12">
+              <a-form-item label="佣金比例(commissionRate)" v-bind="validateInfos.commissionRate" id="commissionContractForm-commissionRate" name="commissionRate">
+                <a-input v-model:value="formData.commissionRate" AutoComplete="off" />
+              </a-form-item>
+            </a-col>
             <a-col :span="12">
               <a-form-item label="备注(notes)" v-bind="validateInfos.notes" id="commissionContractForm-notes" name="notes">
                 <a-input v-model:value="formData.notes" AutoComplete="off" />
@@ -152,6 +157,7 @@
         saleDepartmenName:'',
         notes: '',
         attachs: '',
+        commissionRate:''
       });
 
       //表单验证