From a8f5abe9c7787d52f892186012da8d44d4624061 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 14 Nov 2024 08:13:12 +0800
Subject: [PATCH] md

---
 .../emisCommissionQuoteForm.vue               | 32 ++++++++--
 src/views/emis/emisCommissionQuote/index.vue  | 62 ++++++++++++++-----
 2 files changed, 73 insertions(+), 21 deletions(-)

diff --git a/src/views/emis/emisCommissionQuote/emisCommissionQuoteForm.vue b/src/views/emis/emisCommissionQuote/emisCommissionQuoteForm.vue
index 0a6be151..b26da257 100644
--- a/src/views/emis/emisCommissionQuote/emisCommissionQuoteForm.vue
+++ b/src/views/emis/emisCommissionQuote/emisCommissionQuoteForm.vue
@@ -9,7 +9,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="提成费用类型" prop="feeType" >
+            <el-form-item label="提成类型" prop="feeType" >
               <el-select v-model="form.feeType" placeholder="提成费用类型" style="width:100%">
                   <el-option
                     v-for="dict in dict.type.emis_commission_fee_type"
@@ -84,8 +84,8 @@
                 </el-form-item>
               </el-col> -->
               <el-col :span="24">
-                  <el-form-item label="启用状态" prop="status">
-                  <el-radio-group v-model="form.status">
+                  <el-form-item label="启用状态" prop="blOpen">
+                  <el-radio-group v-model="form.blOpen">
                     <el-radio :label="1">启用</el-radio>
                     <el-radio :label="0">停用</el-radio>
                   </el-radio-group>
@@ -235,10 +235,30 @@ export default {
       isCopy:false,
       // 表单校验
       rules: {
-        quoteId: [
-          { required: true, message: "序号不能为空", trigger: "blur" }
+        quoteName: [
+          { required: true, message: "报价名称不能为空", trigger: "blur" }
         ],
-
+        feeType: [
+          { required: true, message: "费用类型不能为空", trigger: "blur" }
+        ],
+        startDate: [
+          { required: true, message: "开始日期不能为空", trigger: "blur" }
+        ],
+        endDate: [
+          { required: true, message: "结束日期不能为空", trigger: "blur" }
+        ],
+        postType: [
+          { required: true, message: "岗位类型不能为空", trigger: "blur" }
+        ],
+        calcType: [
+          { required: true, message: "计算类型不能为空", trigger: "blur" }
+        ],
+        transType: [
+          { required: true, message: "快递类型不能为空", trigger: "blur" }
+        ],
+        blOpen: [
+          { required: true, message: "启用类型不能为空", trigger: "blur" }
+        ]
       }
     };
   },
diff --git a/src/views/emis/emisCommissionQuote/index.vue b/src/views/emis/emisCommissionQuote/index.vue
index 31324209..c38b2652 100644
--- a/src/views/emis/emisCommissionQuote/index.vue
+++ b/src/views/emis/emisCommissionQuote/index.vue
@@ -114,6 +114,16 @@
                   v-hasPermi="['emis:emisCommissionQuote:add']"
                 >新增提成方案</el-button>
               </el-col>
+              <el-col :span="1.5">
+              <el-button
+                type="warning"
+                plain
+                size="mini"
+                :disabled="single"
+                @click="handleCopy"
+                v-hasPermi="['emis:emisCommissionQuote:add']"
+              >复制方案</el-button>
+            </el-col>
 
               <el-col :span="1.5">
                 <el-button
@@ -124,7 +134,7 @@
                   :disabled="single"
                   @click="handleUpdate"
                   v-hasPermi="['emis:emisCommissionQuote:edit']"
-                >修改</el-button>
+                >修改方案</el-button>
               </el-col>
               <el-col :span="1.5">
                 <el-button
@@ -137,22 +147,22 @@
                   v-hasPermi="['emis:emisCommissionQuote:remove']"
                 >删除</el-button>
               </el-col>
-              <!-- <el-col :span="1.5">
-                <el-button
-                  type="warning"
-                  plain
-                  icon="el-icon-download"
-                  size="mini"
-                  @click="handleExport"
-                  v-hasPermi="['emis:emisCommissionQuote:export']"
-                >导出</el-button>
-              </el-col> -->
+
           </el-row>
       </div>
 
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column :label="$t('方案名称')" align="left" prop="quoteName" min-width="200" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('提成费用类型')" align="center" prop="feeType" min-width="150" >
+      <!-- <el-table-column :label="$t('方案名称')" align="left" prop="quoteName" min-width="200" :show-overflow-tooltip="true"/> -->
+      <el-table-column :label="$t('方案名称')" align="left" prop="quoteName" :show-overflow-tooltip="true" width="350" >
+         <template slot-scope="scope">
+            <div  class="link-type" @click="handleUpdate(scope.row)">
+              <span v-if="scope.row.blOpen==1">{{scope.row.quoteName}}</span>
+              <span v-else ><span style="text-decoration:line-through;color:gray">{{scope.row.quoteName}}</span>-已停用</span>
+            </div>
+         </template>
+      </el-table-column>
+
+      <el-table-column :label="$t('提成类型')" align="center" prop="feeType" min-width="150" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.emis_commission_fee_type" :value="scope.row.feeType"/>
         </template>
@@ -173,8 +183,20 @@
               </div>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('起始国')" align="center" prop="fromCountryName" min-width="100" />
-      <el-table-column :label="$t('目的国')" align="center" prop="countryName" min-width="100" />
+      <el-table-column :label="$t('起始国')" align="center" prop="fromCountryName" min-width="100" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span v-if="scope.row.fromCountryName==''">全部</span>
+          <span v-else>{{ scope.row.fromCountryName }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column :label="$t('目的国')" align="center" prop="countryName" min-width="100" :show-overflow-tooltip="true">
+      <template slot-scope="scope">
+          <span v-if="scope.row.countryName==''">全部</span>
+          <span v-else>{{ scope.row.countryName }}</span>
+        </template>
+      </el-table-column>
+
       <el-table-column :label="$t('岗位类型')" align="center" prop="postType" min-width="100" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.emis_commission_post" :value="scope.row.postType"/>
@@ -239,6 +261,7 @@ export default {
       emisCommissionQuoteList: [],
 
       currentId:null,
+      currentQuote:null,
       openForm: false,
       titleForm: "",
 
@@ -302,6 +325,9 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.quoteId)
+      let [lastObj]=selection.slice(-1);
+      this.currentQuote=lastObj;
+
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
@@ -317,6 +343,12 @@ export default {
       this.openForm= true;
       this.titleForm = "新增提成方案";
     },
+    handleCopy() {
+      this.currentId = this.currentQuote.quoteId ;
+      this.openForm = true;
+      this.isCopy = true;
+      this.titleForm = "复制方案【"+this.currentQuote.quoteName+"】";
+    },
     handleShowMoreInput(){
       this.moreInputVisible = !this.moreInputVisible;
     },