问题修改

CallCenterWeb.UI/src/views/commodityManagement/commodityList/components/addOrEdit.vue

@@ -212,13 +212,6 @@ export default {
             message: "请输入商品名称",
           },
         ],
-        ProductShortName: [
-          {
-            required: true,
-            trigger: "blur",
-            message: "请输入商品副标题",
-          },
-        ],
         ProductNumber: [
           {
             required: true,
@@ -260,13 +253,6 @@ export default {
         //   type: 'number',
         //   message: '特惠价格必须为数字'
         // }],
-        PinyinShort: [
-          {
-            required: true,
-            trigger: "blur",
-            message: "请输入拼音简写",
-          },
-        ],
       },
       updateForm: {
         categoriesPlaceholder: "请选择商品分类",

CallCenterWeb.UI/src/views/commodityManagement/commodityList/components/searchFilter.vue

@@ -5,7 +5,7 @@
     <el-input v-model="searchDatas.productName" placeholder="商品名称" class="filter-item"></el-input>
     <el-input v-model="searchDatas.pinyinShort" placeholder="拼音简写" class="filter-item"></el-input>
     <el-input v-model="searchDatas.productNumber" placeholder="商品款号" class="filter-item"></el-input>
-    <el-input v-model="searchDatas.productShortName" placeholder="商品副标题" class="filter-item"></el-input>
+    <!-- <el-input v-model="searchDatas.productShortName" placeholder="商品简码" class="filter-item"></el-input> -->
     <el-select v-model="searchDatas.tag" placeholder="请选择商品标签" class="filter-item form_select" clearable>
       <el-option v-for="item in commodityLabelLists" :key="item.F_ID" :label="item.F_TagName" :value="item.F_TagName" />
     </el-select>
@@ -49,7 +49,7 @@ export default {
           productName: "", //商品名称
           pinyinShort: "", //拼音缩写
           productNumber: "", //商品编码
-          productShortName: "", //商品副标题
+          productShortName: "", //商品简码
           tag: "", //商品标签
         }
       },
@@ -179,7 +179,7 @@ export default {
           parent: this, // 当前的vue对象
           data: { rowid: "" }, // props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
         },
-        area: ["30%", "30%"],
+        area: ["40%", "40%"],
         shadeClose: false,
         title: "导入商品",
       })

CallCenterWeb.UI/src/views/marketingManagement/fullGiveMarketing/components/addOrEdit.vue

@@ -4,61 +4,32 @@
       <el-form-item label="政策名称" prop="policyName">
         <el-input v-model="ruleForm.policyName" placeholder="请输入政策名称"></el-input>
       </el-form-item>
-      <el-form-item label="促销规则" prop="promotionSpecifications">
+      <!-- <el-form-item label="促销规则" prop="promotionSpecifications">
         <el-select v-model="ruleForm.promotionSpecifications" clearable placeholder="请选择促销方式">
           <el-option label="按总件数" value="按总件数"></el-option>
           <el-option label="按总金额" value="按总金额"></el-option>
         </el-select>
-        <!-- <el-input v-model="ruleForm.promotionSpecifications" placeholder="请输入促销规则"></el-input> -->
       </el-form-item>
       <el-form-item label="绑定赠品" prop="bundledGifts">
         <el-select v-model="ruleForm.bundledGifts" multiple placeholder="请选择绑定赠品" label-width="90px">
-          <el-option
-            v-for="item in giftsList"
-            :key="item.F_ProductId"
-            :label="item.F_ProductName"
-            :value="item.F_ProductId">
-          </el-option>
+          <el-option v-for="item in giftsList" :key="item.F_ProductId" :label="item.F_ProductName" :value="item.F_ProductId"> </el-option>
         </el-select>
-        <!-- <el-input v-model="ruleForm.bundledGifts" placeholder="请输入绑定赠品"></el-input> -->
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="政策描述" prop="policyDescription">
         <el-input v-model="ruleForm.policyDescription" placeholder="请输入政策描述"></el-input>
       </el-form-item>
       <el-form-item label="政策有效期" prop="lateValidity">
-        <el-date-picker
-        v-model="ruleForm.lateValidity"
-        :picker-options="pickerOptions"
-        class="filter-item"
-        type="daterange"
-        format="yyyy年MM月dd日"
-        value-format="yyyy-MM-dd"
-        align="left"
-        unlink-panels
-        range-separator="至"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-      />
+        <el-date-picker v-model="ruleForm.lateValidity" :picker-options="pickerOptions" class="filter-item" type="daterange" format="yyyy年MM月dd日" value-format="yyyy-MM-dd" align="left" unlink-panels range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
         <!-- <el-date-picker v-model="ruleForm.lateValidity" type="date" placeholder="请选择延迟有效期" class="form_date"></el-date-picker> -->
       </el-form-item>
       <el-form-item label="适用会员" prop="applicableMember">
         <el-select v-model="ruleForm.applicableMember" clearable placeholder="请选择会员标签">
-          <el-option
-            v-for="item in memeberList"
-            :key="item.F_ID"
-            :label="item.F_Name"
-            :value="item.F_ID">
-          </el-option>
+          <el-option v-for="item in memeberList" :key="item.F_ID" :label="item.F_Name" :value="item.F_ID"> </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="绑定商品标签" prop="boundGoods">
         <el-select v-model="ruleForm.boundGoods" clearable placeholder="请选择绑定商品标签">
-          <el-option
-            v-for="item in shopList"
-            :key="item.F_TagName"
-            :label="item.F_TagName"
-            :value="item.F_TagName">
-          </el-option>
+          <el-option v-for="item in shopList" :key="item.F_TagName" :label="item.F_TagName" :value="item.F_TagName"> </el-option>
         </el-select>
         <!-- <el-input v-model="ruleForm.boundGoods" placeholder="请输入绑定商品"></el-input> -->
       </el-form-item>
@@ -74,201 +45,214 @@
 </template>
 
 <script>
-import { getProviceCity, getDictionary } from '@/api/commonAPI'
-import { getFullMarketingDetail, addFullMarketing, editFullMarketing,getGifts,getshopping } from '@/api/marketingManagement/fullGiveMarketing'
-import { getLabelLists} from '@/api/memberManagement/memberList'
-import { validateTel } from '@/utils/validate'
-import { filterContent,pickerOptions } from '@/utils'
+import { getProviceCity, getDictionary } from "@/api/commonAPI"
+import { getFullMarketingDetail, addFullMarketing, editFullMarketing, getGifts, getshopping } from "@/api/marketingManagement/fullGiveMarketing"
+import { getLabelLists } from "@/api/memberManagement/memberList"
+import { validateTel } from "@/utils/validate"
+import { filterContent, pickerOptions } from "@/utils"
 
 export default {
-  name: 'AddOrEdit',
+  name: "AddOrEdit",
   props: {
     rowid: {
       type: String,
-      default: ''
+      default: "",
     },
     callid: {
       type: Number,
-      default: 0
+      default: 0,
     },
     layerid: {
       type: String,
-      default: ''
-    }
+      default: "",
+    },
   },
   data() {
     return {
-      props: { // 自定义省市下拉数据的key值
-        value: 'code',
-        label: 'name',
-        children: 'entityJson'
+      props: {
+        // 自定义省市下拉数据的key值
+        value: "code",
+        label: "name",
+        children: "entityJson",
       },
-      pickerOptions ,// 日期数据
+      pickerOptions, // 日期数据
       ruleForm: {
-        unique_id: '', //		否	string	callid
-        ordercode: '',
-        policyName: '', //政策名称
-        promotionSpecifications: '', //促销规则
+        unique_id: "", //		否	string	callid
+        ordercode: "",
+        policyName: "", //政策名称
+        promotionSpecifications: "", //促销规则
         bundledGifts: [], //绑定赠品
-        policyDescription: '', //政策描述
-        lateValidity: '', //延迟有效期
-        applicableMember: '', //适用会员
-        applicableMemberId: '', //适用会员id
-        boundGoods: '', //绑定商品
-        money: '', //活动金额
+        policyDescription: "", //政策描述
+        lateValidity: "", //延迟有效期
+        applicableMember: "", //适用会员
+        applicableMemberId: "", //适用会员id
+        boundGoods: "", //绑定商品
+        money: "", //活动金额
       },
-      memeberList:[],//会员标签
-      giftsList:[],//绑定赠品数据
-      shopList:[],//绑定商品数据
+      memeberList: [], //会员标签
+      giftsList: [], //绑定赠品数据
+      shopList: [], //绑定商品数据
       rules: {
-        policyName: [{
-          required: true,
-          trigger: 'blur',
-          message: '请输入政策名称',
-        }],
-        lateValidity: [{
-          required: true,
-          trigger: 'blur',
-          message: '请输入政策有效期',
-        }],
+        policyName: [
+          {
+            required: true,
+            trigger: "blur",
+            message: "请输入政策名称",
+          },
+        ],
+        lateValidity: [
+          {
+            required: true,
+            trigger: "blur",
+            message: "请输入政策有效期",
+          },
+        ],
       },
-      loading: false
+      loading: false,
     }
   },
   created() {
-    this.getLable();//获取会员标签
-    this.getGiftsList();//获取绑定赠品
-    this.getShopList();//获取绑定商品
+    this.getLable() //获取会员标签
+    this.getGiftsList() //获取绑定赠品
+    this.getShopList() //获取绑定商品
     if (this.callid) {
       this.ruleForm.unique_id = this.callid
     }
-    Promise.all([])
-      .then(() => {
-        if (this.rowid) {
-          this.ruleForm.ordercode = this.rowid
-          this.getDetail(this.rowid)
-        }
-      })
+    Promise.all([]).then(() => {
+      if (this.rowid) {
+        this.ruleForm.ordercode = this.rowid
+        this.getDetail(this.rowid)
+      }
+    })
   },
   methods: {
     submitForm() {
       this.$refs.ruleForm.validate((valid) => {
         if (valid) {
-          this.ruleForm.content = filterContent.delHtmlTag(this.ruleForm.content)// 保存内容时去掉 html 标签
+          this.ruleForm.content = filterContent.delHtmlTag(this.ruleForm.content) // 保存内容时去掉 html 标签
           this.loading = true
-          return new Promise(resolve =>{
+          return new Promise((resolve) => {
             const params = {
-              F_Type:1,
-              F_ID:this.rowid ? this.rowid : '',
-              F_Name:this.ruleForm.policyName,//政策名称
-              F_PromotionRules:this.ruleForm.promotionSpecifications,//促销规则
-              F_Gift:this.ruleForm.bundledGifts.toString(),//绑定赠品
-              F_Describe:this.ruleForm.policyDescription,//政策描述
-              F_StartTime:this.ruleForm.lateValidity && this.ruleForm.lateValidity[0],//政策开始时间
-              F_EndTime:this.ruleForm.lateValidity && this.ruleForm.lateValidity[1],//政策结束时间
-              F_Member:this.ruleForm.applicableMember,//会员ID
-              F_Commodity:this.ruleForm.boundGoods,//商品ID
-              F_Money:this.ruleForm.money,//活动金额
+              F_Type: 1,
+              F_ID: this.rowid ? this.rowid : "",
+              F_Name: this.ruleForm.policyName, //政策名称
+              F_PromotionRules: this.ruleForm.promotionSpecifications, //促销规则
+              F_Gift: this.ruleForm.bundledGifts.toString(), //绑定赠品
+              F_Describe: this.ruleForm.policyDescription, //政策描述
+              F_StartTime: this.ruleForm.lateValidity && this.ruleForm.lateValidity[0], //政策开始时间
+              F_EndTime: this.ruleForm.lateValidity && this.ruleForm.lateValidity[1], //政策结束时间
+              F_Member: this.ruleForm.applicableMember, //会员ID
+              F_Commodity: this.ruleForm.boundGoods, //商品ID
+              F_Money: this.ruleForm.money, //活动金额
             }
             // 添加
             if (!this.rowid) {
-              addFullMarketing(params).then(response => {
+              addFullMarketing(params)
+                .then((response) => {
+                  this.loading = false
+                  if (response.state.toLowerCase() === "success") {
+                    this.$parent.$layer.close(this.layerid)
+                    if (this.callid) {
+                      this.$parent.getOrderRecord() // 重新加载来电弹屏工单记录
+                    } else {
+                      this.$parent.btn_search() // 重新加载父级数据
+                    }
+                    this.$message.success("恭喜你，添加成功!")
+                  }
+                })
+                .catch(() => {
+                  this.loading = false
+                })
+              return
+            }
+            // 编辑
+            editFullMarketing(params)
+              .then((response) => {
                 this.loading = false
-                if (response.state.toLowerCase() === 'success') {
+                if (response.state.toLowerCase() === "success") {
                   this.$parent.$layer.close(this.layerid)
-                  if (this.callid) {
-                    this.$parent.getOrderRecord() // 重新加载来电弹屏工单记录
-                  } else {
-                    this.$parent.btn_search() // 重新加载父级数据
-                  }
-                  this.$message.success('恭喜你，添加成功!')
+                  this.$parent.getList() // 重新加载父级数据
+                  this.$message.success("恭喜你，编辑成功!")
                 }
-              }).catch(() => {
+              })
+              .catch(() => {
                 this.loading = false
               })
-              return
-            }
-            // 编辑
-            editFullMarketing(params).then(response => {
-              this.loading = false
-              if (response.state.toLowerCase() === 'success') {
-                this.$parent.$layer.close(this.layerid)
-                this.$parent.getList() // 重新加载父级数据
-                this.$message.success('恭喜你，编辑成功!')
-              }
-            }).catch(() => {
-              this.loading = false
-            })
           })
-          
         } else {
-          this.$message.error('请输入有效的必填项信息!')
+          this.$message.error("请输入有效的必填项信息!")
           return false
         }
       })
     },
     resetForm() {
       this.$refs.ruleForm.resetFields()
-      this.ruleForm.lateValidity=''
+      this.ruleForm.lateValidity = ""
     },
     // 详情
     getDetail(rid) {
-      getFullMarketingDetail(rid).then(response => {
-        if (response.state.toLowerCase() === 'success') {
+      getFullMarketingDetail(rid).then((response) => {
+        if (response.state.toLowerCase() === "success") {
           const res = response.data
-          this.ruleForm.policyName = res.F_Name;
-          this.ruleForm.promotionSpecifications = res.F_PromotionRules;
-          this.ruleForm.bundledGifts = res.F_Gift?res.F_Gift.split(','):[];
-          this.ruleForm.policyDescription = res.F_Describe;
-          this.ruleForm.boundGoods = res.F_Commodity;
-          this.ruleForm.applicableMember = res.F_Member?(res.F_Member-0):'';
+          this.ruleForm.policyName = res.F_Name
+          this.ruleForm.promotionSpecifications = res.F_PromotionRules
+          this.ruleForm.bundledGifts = res.F_Gift ? res.F_Gift.split(",") : []
+          this.ruleForm.policyDescription = res.F_Describe
+          this.ruleForm.boundGoods = res.F_Commodity
+          this.ruleForm.applicableMember = res.F_Member ? res.F_Member - 0 : ""
           // this.ruleForm.applicableMemberId = res.F_Member?res.F_Member:'';
-          this.ruleForm.money = res.F_Money;
-          this.ruleForm.lateValidity = [res.F_StartTime,res.F_EndTime];
+          this.ruleForm.money = res.F_Money
+          this.ruleForm.lateValidity = [res.F_StartTime, res.F_EndTime]
         }
       })
     },
     //获取会员标签
-    getLable(){
-      getLabelLists().then(response =>{
-        if(response.state.toLowerCase() == 'success'){
-          this.memeberList=response.rows.Rows
-        }
-      }).catch(result=>{
-        console.log(result)
-      })
+    getLable() {
+      getLabelLists()
+        .then((response) => {
+          if (response.state.toLowerCase() == "success") {
+            this.memeberList = response.rows.Rows
+          }
+        })
+        .catch((result) => {
+          console.log(result)
+        })
     },
     //获取绑定赠品
-    getGiftsList(){
-      getGifts({IsSale:0}).then(response =>{
-        if(response.state.toLowerCase() == 'success'){
-          this.giftsList=response.data.Rows
-        }
-      }).catch(result=>{
-        console.log(result)
-      })
+    getGiftsList() {
+      getGifts({ IsSale: 0 })
+        .then((response) => {
+          if (response.state.toLowerCase() == "success") {
+            this.giftsList = response.data.Rows
+          }
+        })
+        .catch((result) => {
+          console.log(result)
+        })
     },
     //获取绑定商品
-    getShopList(){
-      getshopping({CLass:3}).then(response =>{
-        if(response.state.toLowerCase() == 'success'){
-          this.shopList=response.data
-        }
-      }).catch(result=>{
-        console.log(result)
-      })
+    getShopList() {
+      getshopping({ CLass: 3 })
+        .then((response) => {
+          if (response.state.toLowerCase() == "success") {
+            this.shopList = response.data
+          }
+        })
+        .catch((result) => {
+          console.log(result)
+        })
     },
-  }
+  },
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
 .order_form {
   .form_select {
-  	width: 100%;
+    width: 100%;
   }
   .form_date {
     width: 100%;
   }
 }
-</style>
+</style>

CallCenterWeb.UI/src/views/marketingManagement/fullGiveMarketing/index.vue

@@ -6,15 +6,15 @@
         <span slot="label">{{ item.label }}</span>
         <el-table v-loading="loading" :data="dataLists" border stripe @selection-change="changeSelects">
           <!-- <el-table-column type="selection" width="40"></el-table-column> -->
-          <el-table-column prop="F_Name" label="政策名称" align="center"  width=""></el-table-column>
-          <el-table-column prop="F_PromotionRules" label="促销规则" align="center"  width=""></el-table-column>
-          <el-table-column prop="F_GiftName" label="绑定赠品" align="center"  width=""></el-table-column>
-          <el-table-column prop="F_Describe" label="政策描述" align="center"  width=""></el-table-column>
-          <el-table-column prop="F_StartTime" label="开始时间" align="center"  width=""></el-table-column>
-          <el-table-column prop="F_EndTime" label="结束时间" align="center"  width=""></el-table-column>
-          <el-table-column prop="F_MemberName" label="适用会员" align="center"  width=""></el-table-column>
-          <el-table-column prop="F_Commodity" label="绑定商品" align="center"  width=""></el-table-column>
-          <el-table-column prop="F_Money" label="活动金额" align="center"  width=""></el-table-column>
+          <el-table-column prop="F_Name" label="政策名称" align="center" width=""></el-table-column>
+          <el-table-column prop="F_PromotionRules" label="促销规则" align="center" width=""></el-table-column>
+          <el-table-column prop="F_GiftName" label="绑定赠品" align="center" width=""></el-table-column>
+          <el-table-column prop="F_Describe" label="政策描述" align="center" width=""></el-table-column>
+          <el-table-column prop="F_StartTime" label="开始时间" align="center" width=""></el-table-column>
+          <el-table-column prop="F_EndTime" label="结束时间" align="center" width=""></el-table-column>
+          <el-table-column prop="F_MemberName" label="适用会员" align="center" width=""></el-table-column>
+          <el-table-column prop="F_Commodity" label="绑定商品" align="center" width=""></el-table-column>
+          <el-table-column prop="F_Money" label="活动金额" align="center" width=""></el-table-column>
           <el-table-column label="操作" width="" align="center" class-name="oparate_btn" fixed="right">
             <template slot-scope="scope">
               <el-button type="text" @click="btn_detail(scope.row.F_ID.toString())">详情</el-button>
@@ -23,30 +23,22 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination
-          v-show="pageParams.total > 0"
-          :total="pageParams.total"
-          :pageindex.sync="pageParams.pageindex"
-          :pagesize.sync="pageParams.pagesize"
-          class="pagination"
-          @pagination="getList">
-        </pagination>
+        <pagination v-show="pageParams.total > 0" :total="pageParams.total" :pageindex.sync="pageParams.pageindex" :pagesize.sync="pageParams.pagesize" class="pagination" @pagination="getList"> </pagination>
       </el-tab-pane>
     </el-tabs>
   </div>
 </template>
 
 <script>
-
-import { getOrderLists, deleteFullMarketing } from '@/api/marketingManagement/fullGiveMarketing'
-import searchFilter from './components/searchFilter'
-import addOrEdit from './components/addOrEdit'
-import detail from './components/detail'
-import { formatterContent } from '@/utils'
-import Pagination from '@/components/Pagination' // 对el-pagination 二次封装
+import { getOrderLists, deleteFullMarketing } from "@/api/marketingManagement/fullGiveMarketing"
+import searchFilter from "./components/searchFilter"
+import addOrEdit from "./components/addOrEdit"
+import detail from "./components/detail"
+import { formatterContent } from "@/utils"
+import Pagination from "@/components/Pagination" // 对el-pagination 二次封装
 
 export default {
-  name: 'fullGiveMarketing',
+  name: "fullGiveMarketing",
   components: {
     Pagination,
     searchFilter,
@@ -54,38 +46,39 @@ export default {
   data() {
     return {
       searchDatas: {
-        date: '', //日期
+        date: "", //日期
       },
       loading: false,
       pageParams: {
         pageindex: 1, // 当前第几页
         pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
-        total: 0 // 总共多少数据
+        total: 0, // 总共多少数据
       },
-      dataLists: [],// 列表数据
+      dataLists: [], // 列表数据
       multipleSelection: [], // 选中的数据
       selectedId: [], //选中的id
       activeName: "3",
-      tabMapOptions: [{
-          label: '全部',
-          key: '3',
+      tabMapOptions: [
+        {
+          label: "全部",
+          key: "3",
           num: 0,
         },
         {
-          label: '预告中',
-          key: '0',
+          label: "预告中",
+          key: "0",
           num: 0,
         },
         {
-          label: '进行中',
-          key: '1',
+          label: "进行中",
+          key: "1",
           num: 0,
         },
         {
-          label: '已结束',
-          key: '2',
+          label: "已结束",
+          key: "2",
           num: 0,
-        }
+        },
       ],
     }
   },
@@ -100,18 +93,18 @@ export default {
   methods: {
     getList() {
       this.loading = true
-      return new Promise(resolve => {
+      return new Promise((resolve) => {
         const params = {
           pageindex: this.pageParams.pageindex, // int 第几页
           pagesize: this.pageParams.pagesize, // int 每页几条信息
           type: 1, //满赠营销政策
-          starttime:this.searchDatas.date && this.searchDatas.date[0],//开始时间
-          endtime:this.searchDatas.date && this.searchDatas.date[1],//结束时间
-          process: this.activeName==3?'':this.activeName
+          starttime: this.searchDatas.date && this.searchDatas.date[0], //开始时间
+          endtime: this.searchDatas.date && this.searchDatas.date[1], //结束时间
+          process: this.activeName == 3 ? "" : this.activeName,
         }
-        getOrderLists(params).then(response => {
+        getOrderLists(params).then((response) => {
           this.loading = false
-          if (response.state.toLowerCase() === 'success') {
+          if (response.state.toLowerCase() === "success") {
             this.pageParams.total = response.total
             this.dataLists = response.rows
           }
@@ -128,10 +121,10 @@ export default {
         content: {
           content: detail, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { 'rowid': editId }// props
+          data: { rowid: editId }, // props
         },
-        area: ['80%', '90%'],
-        title: '详情'
+        area: ["80%", "90%"],
+        title: "详情",
       })
     },
     btn_edit(editId) {
@@ -139,46 +132,47 @@ export default {
         content: {
           content: addOrEdit, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { 'rowid': editId }// props
+          data: { rowid: editId }, // props
         },
-        area: ['80%', '90%'],
-        title: '编辑满赠营销'
+        area: ["80%", "90%"],
+        title: "编辑满赠营销",
       })
     },
     btn_delete(editId) {
-      this.$confirm('您确定要将此活动删除吗?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        deleteFullMarketing(editId).then(response => {
-          if (response.state.toLowerCase() === 'success') {
-            this.getList()
-            this.$message.success('删除成功!')
-          }
-        })
-      }).catch(() => {
-        this.$message.info('已取消删除')
+      this.$confirm("您确定要将此活动删除吗?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
+        .then(() => {
+          deleteFullMarketing(editId).then((response) => {
+            if (response.state.toLowerCase() === "success") {
+              this.getList()
+              this.$message.success("删除成功!")
+            }
+          })
+        })
+        .catch(() => {
+          this.$message.info("已取消删除")
+        })
     },
     handleClick(tab, event) {
       console.log(tab, event)
       console.log("key", tab.name)
-      this.activeName=tab.name;
-      this.getList();
+      this.activeName = tab.name
+      this.getList()
     },
     changeSelects(selection) {
       const ids = []
       this.multipleSelection = selection
-      for (let i=0; i<this.multipleSelection.length; i++) {
+      for (let i = 0; i < this.multipleSelection.length; i++) {
         ids.push(this.multipleSelection[i].id)
       }
-      this.selectedId = ids;
+      this.selectedId = ids
     },
-  }
+  },
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-
 </style>

CallCenterWeb.UI/src/views/orderManagement/afterSaleEvent/components/detail.vue

@@ -9,9 +9,7 @@
             </div>
           </el-col>-->
           <el-col :md="21">
-            <h1 class="title">
-              <svg-icon class="title_icon" icon-class="hongqi" />会员信息
-            </h1>
+            <h1 class="title"><svg-icon class="title_icon" icon-class="hongqi" />会员信息</h1>
             <!-- <p class="title_sub"><span class="green">{{ name }}</span> {{ createtime }}</p> -->
             <p class="title_sub">
               <span class="green">{{ name }}</span> 足力健
@@ -101,69 +99,28 @@
       <el-tabs v-model="activeName" @tab-click="handleClick">
         <el-tab-pane label="被推荐人信息" name="first">
           <div class="tab_body">
-            <el-table
-              :data="workOrderCirculationList"
-              border
-              stripe
-            >
-              <el-table-column
-                type="index"
-                label="编号"
-                align="center"
-                width=""
-              />
-              <el-table-column
-                prop="F_Name"
-                label="推荐人"
-                align="center"
-                width=""
-              />
-              <el-table-column
-                prop="F_Phone"
-                label="联系方式"
-                align="center"
-                width=""
-              />
+            <el-table :data="workOrderCirculationList" border stripe>
+              <el-table-column type="index" label="编号" align="center" width="" />
+              <el-table-column prop="F_Name" label="推荐人" align="center" width="" />
+              <el-table-column prop="F_Phone" label="联系方式" align="center" width="" />
             </el-table>
-            <pagination
-              v-show="pageParamsSent.total > 0"
-              :total="pageParamsSent.total"
-              :pageindex.sync="pageParamsSent.pageindex"
-              :pagesize.sync="pageParamsSent.pagesize"
-              class="pagination"
-              @pagination="paginationFun"
-            />
+            <pagination v-show="pageParamsSent.total > 0" :total="pageParamsSent.total" :pageindex.sync="pageParamsSent.pageindex" :pagesize.sync="pageParamsSent.pagesize" class="pagination" @pagination="paginationFun" />
           </div>
         </el-tab-pane>
 
         <el-tab-pane label="订单记录" name="second">
           <div class="tab_body">
-            <el-table
-              :data="orderLists"
-              border
-              stripe
-            >
-              <el-table-column
-                type="index"
-                label="编号"
-                align="center"
-                width=""
-              />
+            <el-table :data="orderLists" border stripe>
+              <el-table-column type="index" label="编号" align="center" width="" />
               <el-table-column prop="F_Id" label="订单编号" align="center" min-width="180">
                 <template slot-scope="scope">
-                  <el-button
-                    type="text"
-                    size="small"
-                    @click="hadndleOrderCode(scope.row.F_Id)"
-                  >{{ scope.row.F_Id }}</el-button
-                  >
+                  <el-button type="text" size="small" @click="hadndleOrderCode(scope.row.F_Id)">{{ scope.row.F_Id }}</el-button>
                 </template>
               </el-table-column>
               <el-table-column prop="F_Customer" label="客户姓名" align="center" min-width />
               <el-table-column prop="F_CustomerPhone" label="手机号码" align="center" min-width="140">
                 <template slot-scope="scope">
                   {{ scope.row.F_CustomerPhone }}
-
                 </template>
               </el-table-column>
               <el-table-column label="订购商品" align="center" min-width>
@@ -186,19 +143,12 @@
                 </template>
               </el-table-column>
             </el-table>
-            <pagination
-              v-show="pageParams.total > 0"
-              :total="pageParams.total"
-              :pageindex.sync="pageParams.pageindex"
-              :pagesize.sync="pageParams.pagesize"
-              class="pagination"
-              @pagination="getList"
-            />
+            <pagination v-show="pageParams.total > 0" :total="pageParams.total" :pageindex.sync="pageParams.pageindex" :pagesize.sync="pageParams.pagesize" class="pagination" @pagination="getList" />
           </div>
         </el-tab-pane>
         <el-tab-pane label="通话记录" name="third">
           <div class="tab_body">
-            <el-table v-loading="loading" :data="calldataLists" border stripe >
+            <el-table v-loading="loading" :data="calldataLists" border stripe>
               <el-table-column type="index" label="编号" align="center" fixed width="80" />
               <el-table-column prop="Caller" label="主叫号码" align="center" min-width />
               <!-- <el-table-column prop="UserCode" label="坐席工号" align="center" min-width ></el-table-column> -->
@@ -208,11 +158,7 @@
               </el-table-column>
               <el-table-column label="呼叫状态" align="center" min-width>
                 <template slot-scope="scope">
-                  <el-tag
-                    :type="scope.row.CallState === 1 ? 'success' : 'danger'"
-                    size="mini"
-                    disable-transitions
-                  >{{ scope.row.CallState | statusFilter }}</el-tag>
+                  <el-tag :type="scope.row.CallState === 1 ? 'success' : 'danger'" size="mini" disable-transitions>{{ scope.row.CallState | statusFilter }}</el-tag>
                 </template>
               </el-table-column>
               <!-- <el-table-column label="处理方式" align="center" min-width>
@@ -223,12 +169,7 @@
       </el-table-column>-->
               <el-table-column label="录音" align="center" min-width>
                 <template slot-scope="scope">
-                  <svg-icon
-                    v-if="scope.row.FilePath"
-                    class="rec_file"
-                    icon-class="bofangluyin"
-                    @click.native="playSound(scope.row.FilePath, scope.row.UserCode)"
-                  />
+                  <svg-icon v-if="scope.row.FilePath" class="rec_file" icon-class="bofangluyin" @click.native="playSound(scope.row.FilePath, scope.row.UserCode)" />
                   <span v-else>-</span>
                 </template>
               </el-table-column>
@@ -258,24 +199,17 @@
         <template slot-scope="scope">{{ scope.row.callopttype | callopttypeFilter }}</template>
       </el-table-column>-->
             </el-table>
-            <pagination
-              v-show="pageParamsCall.total > 0"
-              :total="pageParamsCall.total"
-              :pageindex.sync="pageParamsCall.pageindex"
-              :pagesize.sync="pageParamsCall.pagesize"
-              class="pagination"
-              @pagination="getCallList"
-            />
+            <pagination v-show="pageParamsCall.total > 0" :total="pageParamsCall.total" :pageindex.sync="pageParamsCall.pageindex" :pagesize.sync="pageParamsCall.pagesize" class="pagination" @pagination="getCallList" />
           </div>
         </el-tab-pane>
         <el-tab-pane label="档案转移记录" name="fourth">
           <div class="tab_body">
             <el-table :data="workOrderCirculationList2" border stripe>
               <!-- <el-table-column type="selection" width="40"></el-table-column> -->
-              <el-table-column prop="F_CreateOn" label="转移时间" align="center" fixed width/>
-              <el-table-column prop="F_ToPerson" label="新负责人" align="center" fixed width/>
-              <el-table-column prop="F_NotifyPerson" label="原负责人" align="center" fixed width/>
-              <el-table-column prop="F_Notice" label="消息" align="center" fixed width/>
+              <el-table-column prop="F_CreateOn" label="转移时间" align="center" fixed width />
+              <el-table-column prop="F_ToPerson" label="新负责人" align="center" fixed width />
+              <el-table-column prop="F_NotifyPerson" label="原负责人" align="center" fixed width />
+              <el-table-column prop="F_Notice" label="消息" align="center" fixed width />
               <el-table-column label="状态" align="center" fixed width>
                 <template slot-scope="scope">
                   <el-tag v-if="scope.row.F_State == 0">未读</el-tag>
@@ -285,14 +219,7 @@
                 </template>
               </el-table-column>
             </el-table>
-            <pagination
-              v-show="pageParamsfiled.total > 0"
-              :total="pageParamsfiled.total"
-              :pageindex.sync="pageParamsfiled.pageindex"
-              :pagesize.sync="pageParamsfiled.pagesize"
-              class="pagination"
-              @pagination="paginationFun2"
-            />
+            <pagination v-show="pageParamsfiled.total > 0" :total="pageParamsfiled.total" :pageindex.sync="pageParamsfiled.pageindex" :pagesize.sync="pageParamsfiled.pagesize" class="pagination" @pagination="paginationFun2" />
           </div>
         </el-tab-pane>
         <el-tab-pane label="备注" name="fifth">
@@ -319,185 +246,181 @@
         </el-tab-pane>
       </el-tabs>
     </el-card>
-
   </div>
 </template>
 
 <script>
-import { getMemberInfo, getMemberOrderList } from '@/api/memberManagement/memberList'
-import { getOrderLists } from '@/api/orderManagement/orderList'
-import { mapGetters } from 'vuex'
-import Pagination from '@/components/Pagination' // 对el-pagination 二次封装
-import { filterContent } from '@/utils'
-import { getCallRecords } from '@/api/trafficData/trafficData'
-import audioPlayer from '@/components/audioPlayer'
-import { getFileTranserLists } from '@/api/memberManagement/memberList'
-import afterSale from '@/views/afterSaleManagement/addAfterSale/afterSale'
-import { getChatLogList } from '@/api/afterSaleManagement/afterSaleList'
+import { getMemberInfo, getMemberOrderList } from "@/api/memberManagement/memberList"
+import { getOrderLists } from "@/api/orderManagement/orderList"
+import { mapGetters } from "vuex"
+import Pagination from "@/components/Pagination" // 对el-pagination 二次封装
+import { filterContent } from "@/utils"
+import { getCallRecords } from "@/api/trafficData/trafficData"
+import audioPlayer from "@/components/audioPlayer"
+import { getFileTranserLists } from "@/api/memberManagement/memberList"
+import afterSale from "@/views/afterSaleManagement/addAfterSale/afterSale"
+import { getChatLogList } from "@/api/afterSaleManagement/afterSaleList"
 import detail from "@/views/orderManagement/orderList/detail"
 
 export default {
-  name: 'Detail',
+  name: "Detail",
   components: {
-    Pagination
+    Pagination,
   },
   filters: {
     phoneFilter(status) {
-      const mtel = status.substr(0, 3) + '****' + status.substr(7)
+      const mtel = status.substr(0, 3) + "****" + status.substr(7)
       return mtel
     },
     mobileFilter(status) {
       if (status) {
-        const arr = status.split(',')
-        var mtel = ''
+        const arr = status.split(",")
+        var mtel = ""
         for (let i = 0; i < arr.length; i++) {
-          mtel += arr[i].substr(0, 3) + '****' + arr[i].substr(7) + ','
+          mtel += arr[i].substr(0, 3) + "****" + arr[i].substr(7) + ","
         }
         return mtel.substr(0, mtel.length - 1)
       }
     },
     judgmentStateName(status) {
       const statusMap = {
-        '0': '未提交',
-        '1': '待分仓',
-        '2': '已退回',
-        '3': '已分仓',
-        '4': '无货',
-        '5': '仓库待审核',
-        '6': '已发货',
-        '7': '付款待审核',
-        '8': '待分物流',
-        '9': '物流未通过'
+        0: "未提交",
+        1: "待分仓",
+        2: "已退回",
+        3: "已分仓",
+        4: "无货",
+        5: "仓库待审核",
+        6: "已发货",
+        7: "付款待审核",
+        8: "待分物流",
+        9: "物流未通过",
       }
       return statusMap[status]
     },
     judgmentStatusName(status) {
       const statusMap = {
-        0: '未发出',
-        1: '未签收',
-        2: '签收',
-        3: '改代收',
-        4: '拒收'
+        0: "未发出",
+        1: "未签收",
+        2: "签收",
+        3: "改代收",
+        4: "拒收",
       }
       return statusMap[status]
     },
     judgmentOrderGoods(status) {
-      let orderGoodsNameQuantity = ''
+      let orderGoodsNameQuantity = ""
       for (let i = 0; i < status.length; i++) {
         orderGoodsNameQuantity = `${orderGoodsNameQuantity}${status[i].F_ProductName}*${status[i].F_Count},`
       }
-      orderGoodsNameQuantity = orderGoodsNameQuantity.substring(
-        0,
-        orderGoodsNameQuantity.length - 1
-      )
+      orderGoodsNameQuantity = orderGoodsNameQuantity.substring(0, orderGoodsNameQuantity.length - 1)
       return orderGoodsNameQuantity
     },
     // 呼叫类型
     calltypeFilter(status) {
       const statusMap = {
-        0: '呼入',
-        1: '呼出'
+        0: "呼入",
+        1: "呼出",
       }
       return statusMap[status]
     },
     // 呼叫状态
     statusFilter(status) {
       const statusMap = {
-        0: '未接通',
-        1: '已接通'
+        0: "未接通",
+        1: "已接通",
       }
       return statusMap[status]
     },
     // 外呼类型
     callopttypeFilter(status) {
       const statusMap = {
-        0: '拨号外呼',
-        1: '回访外呼'
+        0: "拨号外呼",
+        1: "回访外呼",
       }
       return statusMap[status]
     },
     // 处理方式
     dealtypeFilter(status) {
       const statusMap = {
-        0: 'IVR处理',
-        1: '骚扰电话',
-        2: '自助服务',
-        3: '转值班电话',
-        4: '留言',
-        5: '呼损',
-        6: '人工处理'
+        0: "IVR处理",
+        1: "骚扰电话",
+        2: "自助服务",
+        3: "转值班电话",
+        4: "留言",
+        5: "呼损",
+        6: "人工处理",
       }
       return statusMap[status]
     },
     // 满意度
     evaluationFilter(status) {
       const statusMap = {
-        0: '-',
-        1: '非常满意',
-        2: '基本满意',
-        3: '不满意'
+        0: "-",
+        1: "非常满意",
+        2: "基本满意",
+        3: "不满意",
       }
       return statusMap[status]
     },
     // 时间格式化
     timesFilter(tm) {
-      if (tm === '1970-01-01 08:00:00') {
-        return '-'
+      if (tm === "1970-01-01 08:00:00") {
+        return "-"
       } else {
         return tm
       }
-    }
+    },
   },
   props: {
     rowid: {
       type: String,
-      default: ''
+      default: "",
     },
     layerid: {
       type: String,
-      default: ''
-    }
+      default: "",
+    },
   },
   data() {
     return {
-      activeName: 'first',
-      name: '', // 姓名
-      phone: '', // 固定电话
-      sex: '', // 性别
-      age: '', // 年龄
-      mobile1: '', // 手机号码1
-      type: '', // 会员类型
-      F_Membership: '', // 会员等级
-      F_Class: '', // 会员分类
-      postcode: '', // 邮编
-      shoesize: '', // 鞋码
-      regtime: '', // 会员日期
-      birthday: '', // 会员生日
-      score: '', // 会员积分
-      recommender: '', // 推荐人
-      recommenderTel: '', // 推荐人手机号
-      money: '', // 累计消费金额
-      totalscore: '', // 累计积分
-      province: '', // 省
-      city: '', // 市
-      area: '', // 县
-      town: '', // 乡
-      address: '', // 地址
-      province1: '', // 省
-      city1: '', // 市
-      area1: '', // 县
-      town1: '', // 乡
-      address1: '', // 地址
-      province2: '', // 省
-      city2: '', // 市
-      area2: '', // 县
-      town2: '', // 乡
-      address2: '', // 地址
-      firstcalltime: '', // 首次通话记录
-      lastholetime: '', // 末联通话记录
-      F_LastModifyOn: '', // 修改时间
-      F_Count: '', //购买次数
-      F_LastModifyBy: '', // 修改人
+      activeName: "first",
+      name: "", // 姓名
+      phone: "", // 固定电话
+      sex: "", // 性别
+      age: "", // 年龄
+      mobile1: "", // 手机号码1
+      type: "", // 会员类型
+      F_Membership: "", // 会员等级
+      F_Class: "", // 会员分类
+      postcode: "", // 邮编
+      shoesize: "", // 鞋码
+      regtime: "", // 会员日期
+      birthday: "", // 会员生日
+      score: "", // 会员积分
+      recommender: "", // 推荐人
+      recommenderTel: "", // 推荐人手机号
+      money: "", // 累计消费金额
+      totalscore: "", // 累计积分
+      province: "", // 省
+      city: "", // 市
+      area: "", // 县
+      town: "", // 乡
+      address: "", // 地址
+      province1: "", // 省
+      city1: "", // 市
+      area1: "", // 县
+      town1: "", // 乡
+      address1: "", // 地址
+      province2: "", // 省
+      city2: "", // 市
+      area2: "", // 县
+      town2: "", // 乡
+      address2: "", // 地址
+      firstcalltime: "", // 首次通话记录
+      lastholetime: "", // 末联通话记录
+      F_LastModifyOn: "", // 修改时间
+      F_Count: "", //购买次数
+      F_LastModifyBy: "", // 修改人
       orderLists: [], // 订单列表数据
       dataLists: [], // 列表数据
       workOrderCirculationList: [],
@@ -508,29 +431,27 @@ export default {
       pageParams: {
         pageindex: 1, // 当前第几页
         pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
-        total: 0 // 总共多少数据
+        total: 0, // 总共多少数据
       },
       pageParamsCall: {
         pageindex: 1, // 当前第几页
         pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
-        total: 0 // 总共多少数据
+        total: 0, // 总共多少数据
       },
       pageParamsSent: {
         pageindex: 1, // 当前第几页
         pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
-        total: 0 // 总共多少数据
+        total: 0, // 总共多少数据
       },
       pageParamsfiled: {
         pageindex: 1, // 当前第几页
         pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
-        total: 0 // 总共多少数据
-      }
+        total: 0, // 总共多少数据
+      },
     }
   },
   computed: {
-    ...mapGetters([
-      'avatar'
-    ])
+    ...mapGetters(["avatar"]),
   },
   created() {
     this.getCallList()
@@ -570,7 +491,7 @@ export default {
     },
     // 详情
     getDetail(rid) {
-      getMemberInfo(rid).then(response => {
+      getMemberInfo(rid).then((response) => {
         const res = response.model
         this.dataLists = response.viplist
         if (this.dataLists.length > 0) {
@@ -588,8 +509,8 @@ export default {
         this.mobile1 = res.F_Mobile // 手机号码1
         this.phone = res.F_Phone // 固定电话
         this.type = res.F_Label // 会员标签
-        this.F_Membership = res.F_Membership// 会员等级
-        this.F_Class = res.F_Class// 会员分类
+        this.F_Membership = res.F_Membership // 会员等级
+        this.F_Class = res.F_Class // 会员分类
         this.postcode = res.F_Postcode // 邮编
         this.shoesize = res.F_ShoeSize // 鞋码
         this.regtime = res.F_RegTime // 会员日期
@@ -616,22 +537,21 @@ export default {
         this.address2 = res.F_Address2 // 备用地址
         this.firstcalltime = res.F_Firstcalltime // 首次通话记录
         this.lastholetime = res.F_Lastholetime // 末联通话记录
-        this.F_LastModifyOn = res.F_LastModifyOn// 修改时间
-        this.F_Count = res.F_Count// 购买次数
-        this.F_LastModifyBy = res.F_LastModifyBy// 修改人
+        this.F_LastModifyOn = res.F_LastModifyOn // 修改时间
+        this.F_Count = res.F_Count // 购买次数
+        this.F_LastModifyBy = res.F_LastModifyBy // 修改人
       })
     },
     // 订单
     getList() {
       return new Promise((resolve) => {
         const params = {
-
           pageindex: this.pageParams.pageindex, // int 第几页
           pagesize: this.pageParams.pagesize, // int 每页几条信息
-          F_VipId: this.rowid
+          F_VipId: this.rowid,
         }
         getOrderLists(params).then((response) => {
-          if (response.state.toLowerCase() === 'success') {
+          if (response.state.toLowerCase() === "success") {
             this.pageParams.total = response.data.Totals
             this.orderLists = response.data.Rows
           }
@@ -640,16 +560,16 @@ export default {
       })
     },
     //备注列表
-    getRemarkList () {
+    getRemarkList() {
       this.loading = true
-      return new Promise(resolve => {
+      return new Promise((resolve) => {
         const params = {
           woid: this.rowid,
           state: 1, //	否	string	模糊查询（呼叫号码）
         }
-        getChatLogList(params).then(response => {
+        getChatLogList(params).then((response) => {
           this.loading = false
-          if (response.state.toLowerCase() === 'success') {
+          if (response.state.toLowerCase() === "success") {
             this.remarkDataLists = response.rows.Rows
           }
         })
@@ -659,13 +579,13 @@ export default {
     //订单列表
     getMemberOrderDataList() {
       this.loading = true
-      return new Promise(resolve => {
+      return new Promise((resolve) => {
         const params = {
           vipid: this.rowid,
         }
-        getMemberOrderList(params).then(response => {
+        getMemberOrderList(params).then((response) => {
           this.loading = false
-          if (response.state.toLowerCase() === 'success') {
+          if (response.state.toLowerCase() === "success") {
             this.memberOrderDataLists = response.rows.Rows
           }
         })
@@ -675,15 +595,15 @@ export default {
     // 通话记录列表
     getCallList() {
       this.loading = true
-      return new Promise(resolve => {
+      return new Promise((resolve) => {
         const params = {
           pageindex: this.pageParamsCall.pageindex, // 第几页
           pagesize: this.pageParamsCall.pagesize, // 每页几条信息
-          CusId: this.rowid
+          CusId: this.rowid,
         }
-        getCallRecords(params).then(response => {
+        getCallRecords(params).then((response) => {
           this.loading = false
-          if (response.state.toLowerCase() === 'success') {
+          if (response.state.toLowerCase() === "success") {
             this.recordpath = response.data.recordpath
             this.pageParamsCall.total = response.data.Totals
             this.calldataLists = response.data.Rows
@@ -698,10 +618,10 @@ export default {
         content: {
           content: afterSale, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: id.toString() } // props
+          data: { rowid: id.toString() }, // props
         },
-        area: ['70%', '80%'],
-        title: '添加售后'
+        area: ["70%", "80%"],
+        title: "添加售后",
       })
     },
     // 已发货订单才能添加售后
@@ -718,11 +638,11 @@ export default {
         content: {
           content: audioPlayer, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { 'recFiles': rec_file, 'artists': artist.toString() }// props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
+          data: { recFiles: rec_file, artists: artist.toString() }, // props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
         },
-        area: ['600px', '230px'],
+        area: ["600px", "230px"],
         shadeClose: true,
-        title: '录音详情'
+        title: "录音详情",
       })
     },
     hadndleOrderCode(ordercode) {
@@ -730,13 +650,13 @@ export default {
         content: {
           content: detail, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: ordercode } // props
+          data: { rowid: ordercode }, // props
         },
-        area: ['70%', '80%'],
-        title: '订单详情'
+        area: ["70%", "80%"],
+        title: "订单详情",
       })
     },
-  }
+  },
 }
 </script>