240125

src/api/index.ts

@@ -13,9 +13,9 @@ let loadingInstance: LoadingType = {}
 const config = {
   // 默认地址请求地址，可在 .env.*** 文件中修改
   // baseURL: process.env.NODE_ENV ?(import.meta.env.VITE_BZD_ERP_APP_API as string) : '' ,
-  // baseURL:'https://erptest.baozhida.cn/api',//测试
+  baseURL:'https://erptest.baozhida.cn/api',//测试
 
-  baseURL:import.meta.env.VITE_SERVE + import.meta.env.VITE_APP_BASE_API,
+  // baseURL:import.meta.env.VITE_SERVE + import.meta.env.VITE_APP_BASE_API,
 
 
   // 设置超时时间（10s）

src/views/storehouse/sales/MyPercentage.vue

@@ -126,9 +126,9 @@ const processdel =  (id:any)=>{
       </template>
       <template #right="{ row }"> 
         <el-button link type="primary" size="small" :disabled="![3,6].includes(row.T_State)" :icon="Check" @click="SubmitReview( row)">提交审核</el-button>
-        <el-button link type="primary" size="small" :disabled="![1,3].includes(row.T_State)" :icon="Edit" @click="openContractFormDrawer('edit', row)">编辑</el-button>
+        <el-button link type="primary" size="small" :disabled="![1,3,6].includes(row.T_State)" :icon="Edit" @click="openContractFormDrawer('edit', row)">编辑</el-button>
         <el-button link type="success" size="small"  :icon="View" @click="processContract(row.Id,'详情')">详情</el-button>
-        <el-button link type="danger" size="small" :disabled="![1,3].includes(row.T_State)"  :icon="Delete" @click="processdel(row.Id)">删除</el-button>
+        <el-button link type="danger" size="small" :disabled="![1,3,6].includes(row.T_State)"  :icon="Delete" @click="processdel(row.Id)">删除</el-button>
       </template>
     </TableBase>
     <MyPercentageForm ref="MyPercentageFormRef" @onTableList="updateOnTableList(TableRef)" />

src/views/storehouse/sales/MyPercentageForm.vue

@@ -316,10 +316,10 @@ defineExpose({
           </el-table>
         </el-form-item>
 
-        <el-form-item label="合同金额：" :label-width="formLabelWidth" prop="T_money">
+        <el-form-item label="提成金额：" :label-width="formLabelWidth" prop="T_money">
           <el-input v-model="form.T_money" type="text" autocomplete="off" placeholder="请输入合同金额" class="w-50" />
         </el-form-item>
-        <el-form-item label="合同负责人：" :label-width="formLabelWidth" prop="T_submit">
+        <el-form-item label="提成人员：" :label-width="formLabelWidth" prop="T_submit">
           <el-input v-model="form.T_submit" placeholder="请选择合同负责人" class="w-50" @focus="selectApprover" />
         </el-form-item>
       </el-form>

src/views/storehouse/sales/Percentage.vue

@@ -78,7 +78,7 @@ onMounted(async () => {
   const result: any = await percentage_User_List({})
   let arr = result.Data.Data || []
   list.value = arr.map((item: any) => {
-    return { value: item.T_uuid, label: item.T_user }
+    return { value: item.T_uuid, label: item.T_name }
   })
 })
 

src/views/storehouse/sales/PercentageDetail1.vue

@@ -7,6 +7,7 @@ import {
 import {
   percentage_Get,
   percentage_Edit,
+  percentage_Approval,
   percentage_Add,
   VerifyContract_List
 } from '@/api/mypercentage/index'
@@ -152,7 +153,7 @@ const AddContract = (formEl: FormInstance | undefined) => {
       if (isNew.value) {
         res = await percentage_Add(params)
       } else {
-        res = await percentage_Edit(params)
+        res = await percentage_Approval(params)
       }
       if (res.Code === 200) {
         ElMessage.success(`${isNew.value ? '添加' : '修改'}成功！！`)