Merge branch 'CD_techPool_297'

src/views/financialManagement/contractProgress.vue

@@ -197,12 +197,7 @@
   let is_new_company=ref(false)
 
   // ------------------ 到款预登记
-  const supplementary_item=reactive({
-    id:0,
-    placement_amount:"",
-    placement_origin_amount:"",
-    create_time:""
-  })
+  let supplementaryId = 0
 
 
 // -----------------------------监听
@@ -736,7 +731,7 @@
   // 合规登记Id
   contractInfo.form.contract_register_id = parseInt(route.query.complianceId) || ''
   // 到款预登记Id
-  supplementary_item.id = parseInt(route.query.supplementaryId) || ''
+  supplementaryId = parseInt(route.query.supplementaryId) || ''
   // complianceId没有，认为是合规登记
   contractInfo.operationtype=contractInfo.form.contract_register_id?(route.query.type || 'compliance'):'compliance'
   
@@ -893,19 +888,16 @@
         }
       }
     })
-  }else if(supplementary_item.id){
+  }else if(supplementaryId){
     // 拿到预登记详情信息
-    // console.log(supplementary_item.id);
-    contractInfo.form.pre_pay_id=supplementary_item.id
+    // console.log(supplementaryId,'supplementaryId');
+    contractInfo.form.pre_pay_id=supplementaryId
     contractInfo.form.supplement =1
     contractInfo.form.company_name = route.query.company_name
-    contractInfo.form.currency_unit = route.query.amount_unit
+    contractInfo.form.currency_unit = route.query.currency_unit
     contractInfo.form.contract_amount = route.query.placement_amount
-    contractInfo.form.new_company = parseInt(route.query.new_company)
     contractInfo.form.start_date = route.query.start_date
     contractInfo.form.end_date = route.query.end_date
-    contractInfo.form.seller_id = parseInt(route.query.seller_id)
-    contractInfo.form.seller_name = route.query.seller_name
     contractInfo.contractValidityDate = [contractInfo.form.start_date,contractInfo.form.end_date]
   }
 </script>

src/views/financialManagement/placementPre.vue

@@ -36,9 +36,7 @@ const router = useRouter()
     title:'',
     editPreForm:{
       company_name:'',
-      new_company:0,
-      seller_id:'',
-      seller_name:'',
+      payment_date:'',
       amount:'',
       currency_unit:'CNY',
       start_date:'',
@@ -47,7 +45,7 @@ const router = useRouter()
     },
     rules:{
       company_name:{required:true,message:'客户名称不能为空',trigger:'blur'},
-      seller_id:{required:true,message:'销售不能为空',trigger:'change'},
+      payment_date:{required:true,message:'到款日不能为空',trigger:'blur'},
       amount:[{required:true,message:'到款金额不能为空',trigger:'blur'},
       {
         validator:(rule,value,callback)=>{
@@ -63,12 +61,9 @@ const router = useRouter()
     },
     validityDate:[]
   })
-  // 是否是新公司的复选框勾选判断
-  const is_new_company=ref(false)
 
   // 监听
   watch(()=>placemenetPre.createtime,(newVal)=>{
-    console.log(newVal);
     if(!newVal){
       placemenetPre.searchParams.start_date=''
       placemenetPre.searchParams.end_date=''
@@ -79,16 +74,7 @@ const router = useRouter()
     searchPlacementPre()
   })
 
-  watch(()=>dialog.editPreForm.new_company,(newVal)=>{
-    if(newVal==1){
-      is_new_company.value=true
-    }else{
-      is_new_company.value=false
-    }
-  })
-
   watch(()=>dialog.validityDate,(newVal)=>{
-    console.log(newVal);
     if(!newVal){
       dialog.editPreForm.start_date=''
       dialog.editPreForm.end_date=''
@@ -106,10 +92,6 @@ const router = useRouter()
       sellerList.value=res.data || []
     })
   }
-  // 销售选中
-  const selectSeller=(value)=>{
-    dialog.editPreForm.seller_name=sellerList.value.find(item => item.admin_id==value).real_name
-  }
 
   // 获取货币列表
   const getCurrencyListFun=()=>{
@@ -123,7 +105,7 @@ const router = useRouter()
     getPrePlacementList(placemenetPre.searchParams).then(res=>{
       placemenetPre.tableData=res.data.list || []
       placemenetPre.total=res.data.page?.total || 0
-      console.log(res);
+      // console.log(res);
     })
   }
   // 切换每页的数量
@@ -152,11 +134,8 @@ const router = useRouter()
     router.push({path:'/financial/list/contractProgress',query:{
       supplementaryId:row.pre_pay_id,
       company_name:row.company_name,
-      seller_id:row.seller_id,
-      seller_name:row.seller_name,
-      amount_unit:row.currency_unit,
+      currency_unit:row.currency_unit,
       placement_amount:row.origin_amount,
-      new_company:row.new_company,
       start_date:row.start_date,
       end_date:row.end_date
     }})
@@ -171,9 +150,7 @@ const router = useRouter()
   const editPre=(row)=>{
     dialog.editPreForm.pre_pay_id = row.pre_pay_id
     dialog.editPreForm.company_name=row.company_name
-    dialog.editPreForm.new_company=row.new_company
-    dialog.editPreForm.seller_id=row.seller_id
-    dialog.editPreForm.seller_name=row.seller_name
+    dialog.editPreForm.payment_date=row.payment_date
     dialog.editPreForm.amount=row.origin_amount
     dialog.editPreForm.currency_unit=row.currency_unit
     dialog.editPreForm.remark=row.remark
@@ -186,9 +163,7 @@ const router = useRouter()
   const dialogClosed=()=>{
     dialog.editPreForm.pre_pay_id = ''
     dialog.editPreForm.company_name=''
-    dialog.editPreForm.new_company=0
-    dialog.editPreForm.seller_id=''
-    dialog.editPreForm.seller_name=''
+    dialog.editPreForm.payment_date=''
     dialog.editPreForm.amount=''
     dialog.editPreForm.currency_unit='CNY'
     dialog.editPreForm.remark=''
@@ -237,7 +212,7 @@ const router = useRouter()
   }
 
   //  ---------------------created
-  getSellerListFun()
+  // getSellerListFun()
   getCurrencyListFun()
   placementPreList()
 </script>
@@ -247,11 +222,11 @@ const router = useRouter()
     <!-- 顶部区域 -->
     <div class="placemenetPre-top-zone">
       <div class="placemenetPre-top-search-zone">
-        <el-input v-model="placemenetPre.searchParams.keyword" placeholder="客户姓名/销售" :prefix-icon="Search"
+        <el-input v-model="placemenetPre.searchParams.keyword" placeholder="客户姓名" :prefix-icon="Search"
         style="width: 340px;margin-right: 30px;" @input="searchPlacementPre" clearable />
-        <el-date-picker v-model="placemenetPre.createtime" start-placeholder="开始日期"
+        <!-- <el-date-picker v-model="placemenetPre.createtime" start-placeholder="开始日期"
         end-placeholder="结束日期" style="max-width: 240px;"
-        value-format="YYYY-MM-DD" type="daterange"></el-date-picker>
+        value-format="YYYY-MM-DD" type="daterange"></el-date-picker> -->
       </div>
       <!-- 按钮区域 -->
       <div class="placemenetPre-top-option-zone" v-permission="'financial:placementPre:add'">
@@ -261,20 +236,12 @@ const router = useRouter()
     </div>
     <div class="placemenetPre-table-zone">
       <!-- 表格 -->
-      <el-table :data="placemenetPre.tableData" border max-height="695px" @sort-change="sortChange"
+      <el-table :data="placemenetPre.tableData" border max-height="695px"
       size="default" style="position: sticky;"> 
         <el-table-column label="客户名称" prop="company_name"
         show-overflow-tooltip min-width="120"></el-table-column>
-        <el-table-column label="是否新客户" prop="new_company" width="100">
-          <template #default="{row}">
-            {{ row.new_company==1?'是':'否' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="销售" width="90" prop="seller_name">
-          <!-- <template #default="{row}">
-            
-          </template> -->
-        </el-table-column>
+        <el-table-column label="到款日" prop="payment_date"
+        show-overflow-tooltip min-width="110"></el-table-column>
         <el-table-column label="到款金额" prop="origin_amount" width="120"></el-table-column>
         <el-table-column label="金额单位" prop="unit_name" width="90">
         </el-table-column>
@@ -284,7 +251,7 @@ const router = useRouter()
           </template>
         </el-table-column>
         <el-table-column label="备注" prop="remark" show-overflow-tooltip></el-table-column>
-        <el-table-column label="创建时间" prop="create_time" width="165" sortable="custom"></el-table-column>
+        <!-- <el-table-column label="创建时间" prop="create_time" width="165" sortable="custom"></el-table-column> -->
         <el-table-column label="创建人" width="90" prop="admin_name"></el-table-column>
         <el-table-column label="操作" fixed="right" 
         v-permission="['financial:placementPre:supplementary','financial:placementPre:edit','financial:placementPre:delete']">
@@ -325,15 +292,12 @@ const router = useRouter()
         :rules="dialog.rules" style="margin-top: 10px;">
           <el-form-item label="客户名称" prop="company_name">
             <el-input v-model="dialog.editPreForm.company_name"
-            placeholder="请输入客户名称" style="width:260px" />
-            <el-checkbox v-model="is_new_company" label="新客户" style="margin-left: 20px;min-width: 100px;"
-            size="large" @change="(value) => dialog.editPreForm.new_company = value?1:0" />
+            placeholder="请输入客户名称" style="width:346px" />
           </el-form-item>
-          <el-form-item label="销售" prop="seller_id">
-            <el-select v-model="dialog.editPreForm.seller_id" placeholder="请选择销售" style="width: 346px;"
-            filterable @change="selectSeller">
-              <el-option :label="item.real_name" :value="item.admin_id" v-for="item in sellerList" :key="item.admin_id"></el-option>
-            </el-select>
+          <el-form-item label="到款日" prop="payment_date">
+            <el-date-picker v-model="dialog.editPreForm.payment_date" placeholder="请选择到款日" 
+            :clearable="false" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+            ></el-date-picker>
           </el-form-item>
           <el-form-item label="到款金额" id="contractInfo-contractAmount"
           prop="amount">
@@ -409,7 +373,7 @@ const router = useRouter()
     }
     .el-date-editor{
       .el-input__wrapper{
-        width: 286px;
+        width: 346px;
       }
     }
   }