订单管理

CallCenterWeb.UI/src/api/orderManagement/orderList.js

@@ -82,6 +82,16 @@ export function getOrderListCustomerService(data) {
   })
 }
 
+// 客服审核
+export function checkOrderCustomerService(data) {
+  return request({
+    url: 'api/order/checkorderbykf',
+    method: 'post',
+    data
+  })
+}
+
+
 // 获取库管订单列表
 export function getOrderListCustodian(data) {
   return request({

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

@@ -39,29 +39,36 @@
           </el-form-item>
         </el-col>
         <el-col :md="12">
-          <el-form-item label="市场价格" prop="MarketPrice">
-            <el-input v-model="ruleForm.MarketPrice" placeholder="请输入市场价格"/>
+          <el-form-item label="款号名称/品名" prop="ProductNumberName">
+            <el-input v-model="ruleForm.ProductNumberName" placeholder="请输入款号名称/品名"/>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :md="12">
+          <el-form-item label="市场价格" prop="MarketPrice">
+            <el-input v-model="ruleForm.MarketPrice" placeholder="请输入市场价格"/>
+          </el-form-item>
+        </el-col>
+        <el-col :md="12">
           <el-form-item label="会员价格" prop="MemberPrice">
             <el-input v-model="ruleForm.MemberPrice" placeholder="请输入会员价格"/>
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row :gutter="20">
         <el-col :md="12">
           <el-form-item label="特惠价格" prop="SpecialPrice">
             <el-input v-model="ruleForm.SpecialPrice" placeholder="请输入特惠价格"/>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
         <el-col :md="12">
           <el-form-item label="拼音简写" prop="PinyinShort">
             <el-input v-model="ruleForm.PinyinShort" placeholder="请输入拼音简写"/>
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row :gutter="20">
         <el-col :md="12">
           <el-form-item label="商品标签" prop="tag">
             <el-select v-model="ruleForm.tag" placeholder="请选择商品标签" class="form_select" clearable>
@@ -74,18 +81,11 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
         <el-col :md="12">
           <el-form-item label="产地" prop="Address">
             <el-input v-model="ruleForm.Address" placeholder="请输入产地"/>
           </el-form-item>
         </el-col>
-        <el-col :md="12">
-          <el-form-item label="描述" prop="Des">
-            <el-input v-model="ruleForm.Des" placeholder="请输入描述"/>
-          </el-form-item>
-        </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :md="12">
@@ -120,6 +120,11 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :md="12">
+          <el-form-item label="描述" prop="Des">
+            <el-input v-model="ruleForm.Des" placeholder="请输入描述"/>
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row>
         <el-col>
@@ -167,6 +172,7 @@ export default {
         ProductName: '', //商品名称
         ProductShortName: '', //副标题
         ProductNumber: '', //款号
+        ProductNumberName: '', //款号名称/品名
         MarketPrice: '', //市场价格
         MemberPrice: '', //会员价格
         SpecialPrice: '', //特惠价格
@@ -206,6 +212,11 @@ export default {
           trigger: 'blur',
           message: '请输入款号',
         }],
+        ProductNumberName: [{
+          required: true,
+          trigger: 'blur',
+          message: '请输入款号名称/品名',
+        }],
         MarketPrice: [{
           required: true,
           trigger: 'blur',
@@ -297,6 +308,7 @@ export default {
           this.ruleForm.ProductName = res.F_ProductName //商品名称
           this.ruleForm.ProductShortName = res.F_ProductShortName //副标题
           this.ruleForm.ProductNumber = res.F_ProductNumber //款号
+          this.ruleForm.ProductNumberName = res.F_ProductNumberName //款号名称/品名
           this.ruleForm.MarketPrice = res.F_MarketPrice //市场价格
           this.ruleForm.MemberPrice = res.F_MemberPrice //会员价格
           this.ruleForm.SpecialPrice = res.F_SpecialPrice //特惠价格

CallCenterWeb.UI/src/views/orderManagement/createOrder/index.vue

@@ -132,24 +132,29 @@
                 </el-form-item>
               </el-col>
               <el-col :span='12'>
-                <el-form-item label="支付方式" prop="F_PayType" >
-                  <el-input v-model="ruleForm.F_PayType" placeholder="请输入支付方式"/>
+                <el-form-item label="运费" prop="F_ExpressFee" >
+                  <el-input v-model="ruleForm.F_ExpressFee" placeholder="请输入运费"/>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span='12'>
+                <el-form-item label="支付方式" prop="F_PayType" >
+                  <el-input v-model="ruleForm.F_PayType" placeholder="请输入支付方式"/>
+                </el-form-item>
+              </el-col>
+              <el-col :span='12'>
                 <el-form-item label="实收金额" prop="F_RealPrice" >
                   <el-input v-model="ruleForm.F_RealPrice" placeholder="请输入实收金额"/>
                 </el-form-item>
               </el-col>
+            </el-row>
+            <el-row>
               <el-col :span='12'>
                 <el-form-item label="使用积分" prop="F_Score" >
                   <el-input v-model="ruleForm.F_Score" placeholder="请输入使用积分"/>
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row>
               <el-col :span='12'>
                 <el-form-item label="关联会员ID" prop="F_VipId" >
                   <el-input v-model="ruleForm.F_VipId" placeholder="请输入关联会员ID"/>
@@ -313,6 +318,7 @@ export default {
         F_Address: '', //否 string 详细地址
         F_PostalCode: '', //否 string 邮编
         F_Express: '', //否 string 选择的快递
+        F_ExpressFee: '', //否 number 运费
         F_PayType: '', //否 string  支付方式
         F_Stock: '', //否 string 出货仓库
         F_RealPrice: '', //否 number 实收金额
@@ -340,11 +346,6 @@ export default {
           trigger: 'blur',
           message: '请输入订单类型',
         }],
-        F_Stock: [{
-          required: true,
-          trigger: 'blur',
-          message: '请输入订单类型',
-        }],
         F_Id: [{
           required: true,
           trigger: 'blur',
@@ -369,6 +370,7 @@ export default {
         if (valid) {
           this.ruleForm.F_State = state
           this.ruleForm.OrderDetailList = this.commodityTableData
+          this.ruleForm.F_ExpressFee = this.ruleForm.F_ExpressFee == '' ? 0 : this.ruleForm.F_ExpressFee
           this.ruleForm.F_RealPrice = this.ruleForm.F_RealPrice == '' ? 0 : this.ruleForm.F_RealPrice
           this.ruleForm.F_VipId = this.ruleForm.F_VipId == '' ? 0 : this.ruleForm.F_VipId
           this.ruleForm.F_Score = this.ruleForm.F_Score == '' ? 0 : this.ruleForm.F_Score
@@ -389,9 +391,16 @@ export default {
       })
     },
     resetForm() {
+      // this.$refs.commoditySearchData.resetFields()
+      this.$refs.ruleForm.resetFields()
       this.activityAccountData = []
       this.commodityTableData = []
-      this.$refs.ruleForm.resetFields()
+      this.generateId()
+      this.commoditySearchData.classId = '' // 商品分类id
+      this.commoditySearchData.className = '' // 商品分类名称
+      this.commoditySearchData.productName = '' //商品名称
+      this.commoditySearchData.productId = '' //商品id
+      this.commoditySearchData.num = 1 //商品数量
     },
     //获取省下拉数据
     getProvince() {
@@ -500,7 +509,9 @@ export default {
       })
     },
     generateId() {
+      console.log("1231231")
       let timestamp = new Date().getTime()
+      console.log("213",timestamp)
       this.ruleForm.F_Id = 'BJ' + this.staffNumber + 'T' + timestamp
     },
     //获取商品分类
@@ -535,7 +546,8 @@ export default {
           PinyinShort: '',
           ProductNumber: '',
           ProductShortName: '',
-          tag: ''
+          tag: '',
+          issale: 1,
         }
         getCommodityList(params).then(response => {
           this.loading = false

CallCenterWeb.UI/src/views/orderManagement/orderList/edit.vue

@@ -112,6 +112,11 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span='12'>
+          <el-form-item label="运费" prop="F_ExpressFee" >
+            <el-input v-model="ruleForm.F_ExpressFee" placeholder="请输入运费"/>
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item label="支付方式" >
             <el-input v-model="ruleForm.F_PayType" placeholder="请输入支付方式"/>
@@ -268,7 +273,6 @@ export default {
       pickerOptions, // 日期数据
 
       ruleForm: {
-        orderid: "",
         F_Customer: '', //是 sring 客户姓名
         F_CustomerPhone: '', //是 sting 手机号码
         F_ADFrom: '', //是 string 消息来源
@@ -288,6 +292,7 @@ export default {
         F_Address: '', //否 string 详细地址
         F_PostalCode: '', //否 string 邮编
         F_Express: '', //否 string 选择的快递
+        F_ExpressFee: '', //否 number 运费
         F_PayType: '', //否 string  支付方式
         F_Stock: '', //否 string 出货仓库
         F_RealPrice: '', //否 number 实收金额
@@ -333,7 +338,6 @@ export default {
     Promise.all([
     ]).then(() => {
       if (this.rowid) {
-        this.ruleForm.orderid = this.rowid;
         this.getDetail(this.rowid);
       }
     });
@@ -344,7 +348,8 @@ export default {
         if (valid) {
           this.loading = true;
           this.ruleForm.F_State = state
-          this.ruleForm.OrderDetailList = this.commodityTableData
+          this.ruleForm.OrderDetailList = this.ruleForm.OrderDetailList === this.commodityTableData ? [] : this.commodityTableData
+          this.ruleForm.F_ExpressFee = this.ruleForm.F_ExpressFee == '' ? 0 : this.ruleForm.F_ExpressFee
           this.ruleForm.F_RealPrice = this.ruleForm.F_RealPrice == '' ? 0 : this.ruleForm.F_RealPrice
           this.ruleForm.F_VipId = this.ruleForm.F_VipId == '' ? 0 : this.ruleForm.F_VipId
           this.ruleForm.F_Score = this.ruleForm.F_Score == '' ? 0 : this.ruleForm.F_Score
@@ -504,7 +509,8 @@ export default {
           PinyinShort: '',
           ProductNumber: '',
           ProductShortName: '',
-          tag: ''
+          tag: '',
+          issale: 1,
         }
         getCommodityList(params).then(response => {
           this.loading = false
@@ -593,6 +599,7 @@ export default {
           this.ruleForm.F_Address = res.F_Address //详细地址
           this.ruleForm.F_PostalCode = res.F_PostalCode //邮编
           this.ruleForm.F_Express = res.F_Express + '' //选择的快递
+          this.ruleForm.F_ExpressFee = res.F_ExpressFee //运费
           this.ruleForm.F_PayType = res.F_PayType //支付方式
           this.ruleForm.F_Stock = res.F_Stock //出货仓库
           this.ruleForm.F_RealPrice = res.F_RealPrice == 0 ? '' : res.F_RealPrice //实收金额

CallCenterWeb.UI/src/views/orderManagement/orderListCustodian/index.vue

@@ -56,15 +56,19 @@
       <el-table-column prop="F_BelongName" label="归属员工" align="center" />
       <el-table-column prop="F_Type" label="订单类型" align="center" />
       <el-table-column prop="F_Express" label="快递公司" align="center" />
-      <!-- <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
+      <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
         <template slot-scope="scope">
-          <el-button v-permission="'HY_detail'" type="text" @click="btn_detail(scope.row.F_Id)">详情</el-button>
+          <el-button v-permission="'HY_apply'" type="text" @click="btn_apply(scope.row.F_Id)">申请</el-button>
+          <el-button v-permission="'HY_apply'" type="text" @click="btn_apply(scope.row.F_Id)">申请</el-button>
+          <el-button v-permission="'HY_apply'" type="text" @click="btn_apply(scope.row.F_Id)">申请</el-button>
+          <el-button v-permission="'HY_apply'" type="text" @click="btn_apply(scope.row.F_Id)">申请</el-button>
+          <!-- <el-button v-permission="'HY_detail'" type="text" @click="btn_detail(scope.row.F_Id)">详情</el-button>
           <el-button v-permission="'HY_apply'" type="text" @click="btn_apply(scope.row.F_Id)">申请</el-button>
           <el-button v-permission="'HY_edit'" type="text" @click="btn_edit(scope.row.F_Id)">编辑</el-button>
           <el-button v-permission="'HY_cancel'" type="text" @click="btn_cancel(scope.row.F_Id)">取消</el-button>
-          <el-button v-permission="'HY_afterSales'" type="text" @click="btn_afterSales(scope.row.F_Id)">售后</el-button>
+          <el-button v-permission="'HY_afterSales'" type="text" @click="btn_afterSales(scope.row.F_Id)">售后</el-button> -->
         </template>
-      </el-table-column> -->
+      </el-table-column>
     </el-table>
     <pagination
       v-show="pageParams.total > 0"
@@ -187,17 +191,6 @@ export default {
     handleTabClick(tab, event) {
       this.getList()
     },
-    handle(ordercode){
-       this.$layer.iframe({
-        content: {
-          content: detail, // 传递的组件对象
-          parent: this, // 当前的vue对象
-          data: { 'rowid': ordercode }// props
-        },
-        area: ['80%', '90%'],
-        title: '订单详情'
-      })
-    },
     btn_detail(ordercode){
        this.$layer.iframe({
         content: {

CallCenterWeb.UI/src/views/orderManagement/orderListCustomerService/goback.vue

@@ -0,0 +1,56 @@
+<template>
+    <div>
+        <el-form ref="form" :model="form" label-width="80px">
+            <el-form-item label="订单编号">
+                <el-col :span='12'>
+                    <span>{{ ruleForm.orderid }}</span>
+                </el-col>
+            </el-form-item>
+            <el-form-item label="退回原因">
+                <el-input v-model="ruleForm.remark" type="textarea" placeholder="退回原因"></el-input>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" @click="submitForm()">提交</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+
+import { checkOrderCustomerService } from '@/api/orderManagement/orderList'
+export default {
+    props: {
+        rowid: {
+            type: String,
+            default: ''
+        },
+    },
+    data(){
+        return{
+            ruleForm: {
+                orderid: '', //订单编号
+                state: 2, //订单状态 —— 2 退回
+                remark: '', //备注
+            },
+        }
+    },
+    created() {
+        if (this.rowid) {
+            this.ruleForm.orderid = this.rowid
+        }
+    },
+    methods: {
+        submitForm(){
+            checkOrderCustomerService(this.ruleForm).then(response => {
+                if (response.state.toLowerCase() === 'success') {
+                this.$message.success('恭喜你，工单信息审核成功!')
+                }
+            }).catch(() => {
+                this.loading = false
+            })
+        },
+    },
+}
+</script>
+<style lang="scss" scoped>
+</style>

CallCenterWeb.UI/src/views/orderManagement/orderListCustomerService/index.vue

@@ -56,15 +56,14 @@
       <el-table-column prop="F_BelongName" label="归属员工" align="center" />
       <el-table-column prop="F_Type" label="订单类型" align="center" />
       <el-table-column prop="F_Express" label="快递公司" align="center" />
-      <!-- <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
+      <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
         <template slot-scope="scope">
-          <el-button v-permission="'HY_detail'" type="text" @click="btn_detail(scope.row.F_Id)">详情</el-button>
-          <el-button v-permission="'HY_apply'" type="text" @click="btn_apply(scope.row.F_Id)">申请</el-button>
           <el-button v-permission="'HY_edit'" type="text" @click="btn_edit(scope.row.F_Id)">编辑</el-button>
-          <el-button v-permission="'HY_cancel'" type="text" @click="btn_cancel(scope.row.F_Id)">取消</el-button>
-          <el-button v-permission="'HY_afterSales'" type="text" @click="btn_afterSales(scope.row.F_Id)">售后</el-button>
+          <el-button v-permission="'HY_return'" type="text" @click="btn_goback(scope.row.F_Id)">退回</el-button>
+          <el-button v-permission="'HY_through'" type="text" @click="btn_through(scope.row.F_Id)">通过</el-button>
+          <!-- <el-button v-permission="'HY_detail'" type="text" @click="btn_detail(scope.row.F_Id)">详情</el-button> -->
         </template>
-      </el-table-column> -->
+      </el-table-column>
     </el-table>
     <pagination
       v-show="pageParams.total > 0"
@@ -81,12 +80,11 @@
 import { getDictionaryValueList } from '@/api/commonAPI'
 import { getOrderListCustomerService, cancelOrder } from "@/api/orderManagement/orderList";
 import { pickerOptions, formatterContent } from "@/utils";
+import goback from "./goback";
+import through from "./through";
 // import edit from "./edit";
-// import cancel from './cancel';
 // import detail from './detail';
-// import apply from './apply';
 // import importAuth from './importAuth';
-// import afterSales from './afterSales';
 import Pagination from "@/components/Pagination"; // 对el-pagination 二次封装
 
 export default {
@@ -187,17 +185,6 @@ export default {
     handleTabClick(tab, event) {
       this.getList()
     },
-    handle(ordercode){
-       this.$layer.iframe({
-        content: {
-          content: detail, // 传递的组件对象
-          parent: this, // 当前的vue对象
-          data: { 'rowid': ordercode }// props
-        },
-        area: ['80%', '90%'],
-        title: '订单详情'
-      })
-    },
     btn_detail(ordercode){
        this.$layer.iframe({
         content: {
@@ -209,7 +196,6 @@ export default {
         title: '订单详情'
       })
     },
-
     btn_search() {
       this.pageParams.pageindex = 1;
       this.getList();
@@ -240,42 +226,31 @@ export default {
         title: '导入订单信息'
       })
     },
-    //申请
-    btn_apply(applyId) {
-       this.$layer.iframe({
-        content: {
-          content: apply, // 传递的组件对象
-          parent: this, // 当前的vue对象
-          data: { rowid: applyId } // props
-        },
-        area: ["30%", "40%"],
-        title: "申请内容"
-      });
-    },
-    //取消
-    btn_cancel(cancelId) {
+    //退回订单
+    btn_goback(orderid) {
       this.$layer.iframe({
         content: {
-          content: cancel, // 传递的组件对象
+          content: goback, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: cancelId } // props
+          data: { rowid: orderid } // props
         },
         area: ["30%", "40%"],
-        title: "取消订单"
+        title: "退回订单"
       });
     },
-    //售后
-    btn_afterSales(afterSalesId) {
+    //通过订单
+    btn_through(orderid) {
       this.$layer.iframe({
         content: {
-          content: afterSales, // 传递的组件对象
+          content: through, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: afterSalesId } // props
+          data: { rowid: orderid } // props
         },
         area: ["30%", "40%"],
-        title: "售后内容"
+        title: "通过订单"
       });
     },
+
     //合并
     btn_merge() {},
     //拆分

CallCenterWeb.UI/src/views/orderManagement/orderListCustomerService/through.vue

@@ -0,0 +1,56 @@
+<template>
+    <div>
+        <el-form ref="form" :model="form" label-width="80px">
+            <el-form-item label="订单编号">
+                <el-col :span='12'>
+                    <span>{{ ruleForm.orderid }}</span>
+                </el-col>
+            </el-form-item>
+            <el-form-item label="备注">
+                <el-input v-model="ruleForm.remark" type="textarea" placeholder="备注"></el-input>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" @click="submitForm()">提交</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+
+import { checkOrderCustomerService } from '@/api/orderManagement/orderList'
+export default {
+    props: {
+        rowid: {
+            type: String,
+            default: ''
+        },
+    },
+    data(){
+        return{
+            ruleForm: {
+                orderid: '', //订单编号
+                state: 3, //订单状态 —— 2 退回
+                remark: '', //备注
+            },
+        }
+    },
+    created() {
+        if (this.rowid) {
+            this.ruleForm.orderid = this.rowid
+        }
+    },
+    methods: {
+        submitForm(){
+            checkOrderCustomerService(this.ruleForm).then(response => {
+                if (response.state.toLowerCase() === 'success') {
+                this.$message.success('恭喜你，工单信息审核成功!')
+                }
+            }).catch(() => {
+                this.loading = false
+            })
+        },
+    },
+}
+</script>
+<style lang="scss" scoped>
+</style>