240123

src/api/index.ts

@@ -13,6 +13,7 @@ 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:import.meta.env.VITE_SERVE + import.meta.env.VITE_APP_BASE_API,
 

src/views/storehouse/sales/MyPercentage.vue

@@ -115,6 +115,7 @@ const processdel =  (id:any)=>{
         <el-tag v-if="row.T_State === 3" type="danger" effect="dark"> 审核不通过 </el-tag>
         <el-tag v-if="row.T_State === 4" type="info" effect="dark"> 部分打款 </el-tag>
         <el-tag v-if="row.T_State === 5" type="" effect="dark"> 全部打款 </el-tag>
+        <el-tag v-if="row.T_State === 6" type="danger" effect="dark"> 未提交审核 </el-tag>
       </template>
       <template #T_out="{ row }">
         <el-tag v-if="row.T_out === 2 || row.T_out === 3" type="success" effect="dark">

src/views/storehouse/sales/MyPercentageForm.vue

@@ -21,6 +21,7 @@ import Upload from '@/components/Upload/index.vue'
 import type { FormInstance, FormRules } from 'element-plus'
 import ContractUser from '@/views/storehouse/outStock/receiveUser.vue'
 import MyPercentageFormStorage from '@/views/storehouse/inventory/MyPercentageFormStorage.vue'
+import verifyxiang from '@/views/storehouse/sales/verifyxiang.vue'
 
 const isNew = ref(true)
 const isProduct = ref(false)
@@ -150,6 +151,7 @@ const AddContract = (formEl: FormInstance | undefined) => {
 }
 
 const drawerProductRef = ref<InstanceType<typeof MyPercentageFormStorage> | null>(null)
+const verifyxiangRef = ref<InstanceType<typeof verifyxiang> | null>(null)
 /**
  * 添加产品
  */
@@ -199,8 +201,12 @@ const ProductSelectionAllChange = (selection: any[]) => (tableData.value = selec
 /**
  * 生成合同编号
  */
-const getContractNumber = async () => {
-  contractNumberLoading.value = true
+const getContractNumber = async (id:any) => {
+  console.log('查看',id)
+  if(!id){ElMessage.error('合同编号不能为空哦');return}
+  verifyxiangRef.value?.openDrawer()
+  window.sessionStorage.setItem('globaId', id);
+  verifyxiangRef.value?.getStorehouseContractGet()
 }
 /**
  * 合同负责人
@@ -271,7 +277,7 @@ defineExpose({
                 :remote-method="remoteMethod" :loading="loading" @click="click2" clearable style="width: 200px;">
                 <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
             </el-select>
-            <el-button :loading="contractNumberLoading" type="primary" @click="getContractNumber" style="margin-left: 10px;">查看合同详情</el-button>
+            <el-button :loading="contractNumberLoading" type="primary" @click="getContractNumber(form.T_number)" style="margin-left: 10px;">查看合同详情</el-button>
           </div>
         </el-form-item>
         <el-form-item label="提成类型：" :label-width="formLabelWidth" prop="T_type">
@@ -331,6 +337,7 @@ defineExpose({
     <ContractUser ref="receiveUserdialog" @onUserInfo="getReceiveInfo" title="合同负责人" />
     <MyPercentageFormStorage v-if="isProduct" ref="drawerProductRef" :selectProductData="selectProductData"
       @ontableData="ProductselectionChange" @ontableDataAll="ProductSelectionAllChange"></MyPercentageFormStorage>
+      <verifyxiang ref="verifyxiangRef"></verifyxiang>
   </div>
 </template>
 

src/views/storehouse/sales/Percentage.vue

@@ -44,7 +44,9 @@ const processContract = (type: string, row?: any) => {
   // PercentageDetail1Ref.value?.VerifyltemApi()
   PercentageDetail1Ref.value?.openDrawer(type, row)
 }
- 
+const processContractxiang = (id: string,titles:string) => {
+  router.push({ name: 'PercentageDetail', params: { id, type: fnMd5('contract'),titles:titles}})
+}
 const initParam = reactive({
   User_tokey: globalStore.GET_User_tokey,
   T_name: '',
@@ -148,7 +150,7 @@ const ContractForm = defineAsyncComponent({
       <template #right="{ row }"> 
         <el-button link type="warning" :disabled="![1,3].includes(row.T_State)" size="small"  :icon="Finished" @click="processContract('审核',row)">审核</el-button>
         <el-button link type="primary" :disabled="![2,4,5].includes(row.T_State)" size="small"  :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="success" size="small"  :icon="View" @click="processContractxiang(row.Id,'详情')">详情</el-button>
       </template>
     </TableBase>
   <ContractForm ref="ContractFormRef" :ContForm="ContForm" @onTableList="updateOnTableList(TableRef)" />

src/views/storehouse/sales/PercentageDetail.vue

@@ -219,7 +219,7 @@ const InvoiceRef = ref<InstanceType<typeof PercentageTable> | null>(null)
           <el-col :span="21">
             <el-table border stripe :data="tableData" style="width: 100%" :header-cell-style="headerCellStyle">
               <template v-for="item in columns" :key="item.prop">
-                <el-table-column v-bind="item" v-if="item.fixed !== 'right'">
+                <el-table-column v-bind="item" v-if="item.fixed !== 'right'" :show-overflow-tooltip="true">
                   <template #default="{ row }" v-if="item.prop === item.name">
                     <span v-if="item.prop === 'T_product_relation_sn'">
                       <el-tag v-if="row.T_product_relation_sn === 1" effect="dark">是</el-tag>
@@ -253,7 +253,7 @@ const InvoiceRef = ref<InstanceType<typeof PercentageTable> | null>(null)
             <el-table border stripe :data="tableDatalty" style="width: 100%"
               :header-cell-style="{ background: '#dedfe0', height: '50px' }">
               <template v-for="item in royalty" :key="item.prop">
-                <el-table-column v-bind="item">
+                <el-table-column v-bind="item" :show-overflow-tooltip="true">
                   <template #default="{ row }" v-if="item.prop === item.name">
                     <div v-if="item.prop === 'T_priceNum'">{{ Number(row.T_num) * Number(row.T_price) }}</div>
                   </template>

src/views/storehouse/sales/VerifyForm.vue

@@ -60,7 +60,6 @@ const callbackDrawer = (done: () => void) => {
 const emit = defineEmits<{ (event: 'onTableList'): void }>()
 
 const form:any = ref<ContractFormType>({
-  
   T_uuid: '',
   T_number: '',
   T_product: '',
@@ -76,7 +75,12 @@ const form:any = ref<ContractFormType>({
   T_submit_name: '',
   T_start_date: '',
   T_end_date: '',
-  T_type: '', T_uuid_name: '', T_remit: ''
+  T_type: '', 
+  T_uuid_name: '',
+   T_remit: '',
+   T_approval_money: '',
+  T_approval_opinion: '',
+  T_State: ''
 })
 
 const openDrawer = (type: string, row?: any) => {