فهرست منبع

费用编辑bug

@dongkboy 5 ماه پیش
والد
کامیت
00aa9efc46

+ 11 - 7
src/views/externalAgreement/agreement/components/contactPersonFeeDialogEdit.vue

@@ -16,6 +16,9 @@
               <span class="m-right-20">审核人:{{ costitemEditInfo.auditPerson }}</span>
               <span >审核时间:{{costitemEditInfo.auditTime }}</span>
             </div>
+            <span class="primary" v-if="costitemEditInfo.auditStatus == 2" @click="disabledShow = false"  style="color: #409eff;" >
+                修改并重提交
+              </span>
           </div>
         </div>
         <ElRow :gutter="20" class="m-top-20">
@@ -85,15 +88,15 @@
           <el-table-column prop="costType" label="类型"></el-table-column>
             <el-table-column prop="inlet" label="入口比例" width="180" align="center">
                 <template #default="scope">
-                    <el-input-number v-model="scope.row.inlet" :precision="2" controls-position="right"
+                    <el-input-number v-model="scope.row.inlet"  :disabled="disabledShow" :precision="2" controls-position="right"
                                      style="width: 100%;" :min="0" :max="100" @change="handelRK(scope)">
                         <template #suffix>%</template>
                     </el-input-number>
                 </template>
             </el-table-column>
-            <el-table-column prop="export" label="出口比例" width="180" align="center">
+            <el-table-column prop="export" label="出口比例"   width="180" align="center">
                 <template #default="scope">
-                    <el-input-number v-model="scope.row.export" :precision="2" controls-position="right"
+                    <el-input-number v-model="scope.row.export" :disabled="disabledShow" :precision="2" controls-position="right"
                                      style="width: 100%;" :min="0" :max="100" @change="handelCK(scope)">
                         <template #suffix>%</template>
                     </el-input-number>
@@ -109,7 +112,7 @@
                                   </el-table-column>-->
             <el-table-column prop="addThrow" label="加投比例" width="180" align="center">
                 <template #default="scope">
-                    <el-input-number v-model="scope.row.addThrow" :precision="2" controls-position="right"
+                    <el-input-number v-model="scope.row.addThrow" :disabled="disabledShow" :precision="2" controls-position="right"
                                      style="width: 100%;" :min="0" :max="100" @change="handelJT(scope)">
                         <template #suffix>%</template>
                     </el-input-number>
@@ -117,8 +120,8 @@
             </el-table-column>
             <el-table-column prop="keepPointRatio" label="留点比例" width="180" align="center">
                 <template #default="scope">
-                    <el-input-number v-model="scope.row.keepPointRatio" :precision="2" controls-position="right"
-                                     style="width: 100%;" :min="0" :max="100" @change="handelLD(scope)">
+                    <el-input-number v-model="scope.row.keepPointRatio" :disabled="disabledShow" :precision="2" controls-position="right"
+                                    style="width: 100%;" :min="0" :max="100" @change="handelLD(scope)">
                         <template #suffix>%</template>
                     </el-input-number>
                 </template>
@@ -130,7 +133,7 @@
           <el-button @click="cancel">取消</el-button>
           <el-button type="primary" @click="save(contactPersonFormRef)">提交审核</el-button>
         </div>
-        <div class="flex f-c " v-if="!costitemEditInfo?.reviewDescription && disabledShow">
+        <div class="flex f-c " v-if="!costitemEditInfo?.reviewDescription && props.operationType == 'audit'">
           <el-checkbox v-model="automatic" label="审核后,自动跳支审核下一条费用" size="large" />
           <div class="flex a-c">
             <el-button @click="rejectOperation">审核驳回</el-button>
@@ -158,6 +161,7 @@ const props = defineProps<{
 }>();
 const emits = defineEmits(["cancel", 'save', 'auditOperation', 'rejectOperation']);
 watch(props, () => {
+  console.log(props.costitemEditInfo)
   contactPersonEditInfo.value = props.costitemEditInfo;
   //审核和驳回操作不可编辑
   if (props.operationType == 'audit' || props.operationType == 'rejected') {

+ 6 - 3
src/views/quoteConfig/agreement/components/ruleFeeDialog.vue

@@ -486,7 +486,8 @@ const ptlAgreementCostTypeList = [
     export: 0,
     // commission: 0,
     addThrow: 0,
-    keepPointRatio: 0
+    keepPointRatio: 0,
+    exportKeepPointRatio: 0,
   },
   {
     costType: "商业险",
@@ -494,7 +495,8 @@ const ptlAgreementCostTypeList = [
     export: 0,
     // commission: 0,
     addThrow: 0,
-    keepPointRatio: 0
+    keepPointRatio: 0,
+    exportKeepPointRatio: 0,
   },
   {
     costType: "驾意险",
@@ -502,7 +504,8 @@ const ptlAgreementCostTypeList = [
     export: 0,
     // commission: 0,
     addThrow: 0,
-    keepPointRatio: 0
+    keepPointRatio: 0,
+    exportKeepPointRatio: 0,
   }
 ];
 

+ 6 - 5
src/views/quoteConfig/agreement/components/ruleFeeDialogEdit.vue

@@ -15,6 +15,9 @@
               <span class="m-right-20">审核人:{{ costitemEditInfo.auditPerson }}</span>
               <span >审核时间:{{costitemEditInfo.auditTime }}</span>
             </div>
+            <span class="primary" v-if="costitemEditInfo.approved == 2" @click="disabledShow = false"  style="color: #409eff;" >
+                修改并重提交
+              </span>
           </div>
         </div>
         <div class="agreement ">
@@ -134,7 +137,7 @@
             </el-table-column>
               <el-table-column prop="exportKeepPointRatio" label="出口留点比例" width="180" align="center">
                   <template #default="scope">
-                      <el-input-number v-model="scope.row.exportKeepPointRatio" :precision="2" controls-position="right"
+                      <el-input-number v-model="scope.row.exportKeepPointRatio" :disabled="disabledShow" :precision="2" controls-position="right"
                                        style="width: 100%;" :min="0" :max="100">
                           <template #suffix>%</template>
                       </el-input-number>
@@ -149,8 +152,8 @@
           <el-button @click="cancel">取消</el-button>
           <el-button type="primary" @click="save(editFormRefs)">提交审核</el-button>
         </div>
-<!--          <div class="flex f-c " v-if="!costitemEditInfo?.reviewDescription && props.operationType == 'audit'">-->
-        <div class="flex f-c " v-if="!costitemEditInfo?.approved && !isHideFoot">
+         <div class="flex f-c " v-if="!costitemEditInfo?.reviewDescription && props.operationType == 'audit'">
+        <!-- <div class="flex f-c " v-if="!costitemEditInfo?.approved"> -->
           <el-checkbox v-model="automatic" label="审核后,自动跳支审核下一条费用" size="large" />
           <div class="flex a-c">
             <el-button @click="rejectOperation">审核驳回</el-button>
@@ -171,7 +174,6 @@
 import { ref, } from 'vue'
 import { DrawerProps, ComponentSize, ElMessageBox } from 'element-plus';
 import { loadDicts } from '@/utils/composables/dictService';//字典组件
-import { defineProps, defineEmits } from "vue";
 const direction = ref<DrawerProps['direction']>('rtl')
 const fromSize = ref<ComponentSize>('default')
 
@@ -181,7 +183,6 @@ let RuleConditionRefs = ref()
 
 const props = defineProps<{
   ruleFeeVisible: boolean,
-  isHideFoot: {type:boolean,default:false},  // 是否隐藏底部审核信息
   agreementInfo: any,//协议信息
   RulesInfo: any,//费用信息
   costitemEditInfo: any,//编辑回显数据