问题修改

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

@@ -307,8 +307,10 @@
         <el-tab-pane label="会员订单列表" name="Sixth">
           <div class="tab_body">
             <el-table :data="memberOrderDataLists" border stripe>
+              <el-table-column prop="F_Order" label="订单编号" align="center"></el-table-column>
               <el-table-column prop="F_Name" label="姓名" align="center"></el-table-column>
               <el-table-column prop="F_Mobile" label="手机号" align="center"></el-table-column>
+              <el-table-column prop="F_Money" label="金额" align="center"></el-table-column>
               <el-table-column prop="F_Commodity" label="商品" align="center"></el-table-column>
               <el-table-column prop="F_OrderDate" label="下单日期" align="center"></el-table-column>
               <el-table-column prop="F_Remarks" label="备注" align="center"></el-table-column>

CallCenterWeb.UI/src/views/afterSaleManagement/saleOrderList/components/detail.vue

@@ -307,8 +307,10 @@
         <el-tab-pane label="会员订单列表" name="Sixth">
           <div class="tab_body">
             <el-table :data="memberOrderDataLists" border stripe>
+              <el-table-column prop="F_Order" label="订单编号" align="center"></el-table-column>
               <el-table-column prop="F_Name" label="姓名" align="center"></el-table-column>
               <el-table-column prop="F_Mobile" label="手机号" align="center"></el-table-column>
+              <el-table-column prop="F_Money" label="金额" align="center"></el-table-column>
               <el-table-column prop="F_Commodity" label="商品" align="center"></el-table-column>
               <el-table-column prop="F_OrderDate" label="下单日期" align="center"></el-table-column>
               <el-table-column prop="F_Remarks" label="备注" align="center"></el-table-column>

CallCenterWeb.UI/src/views/custodianManagement/orderListCustodian/importGoback.vue

@@ -1,5 +1,18 @@
 <template>
   <div class="importFile">
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="80px">
+      <el-form-item label="退回" prop="state">
+        <el-select
+          v-model="ruleForm.state"
+          class="form_select"
+          filterable
+          placeholder="请选择退回"
+        >
+          <el-option label="退回上一级" value="0" />
+          <el-option label="退回销售" value="1" />
+        </el-select>
+      </el-form-item>
+    </el-form>
     <el-alert title="选取的EXCEL文件需要严格按照下载的EXCEL模板进行填写！选择好文件后点击导入即可！" type="warning" class="md" show-icon/>
     <el-row>
       <el-col :lg="7" class="md">
@@ -56,9 +69,21 @@ export default {
         },
         uploadUrl: this.$store.getters.serverConfig.BASE_API + 'api/KFOrder/importorderbackexcel',
         uploaderFiles: {// 上传文件的参数
-          state: "",
+          state: '',
         },
         fileList: [], // 展示文件的数据
+      },
+      ruleForm: {
+        state: '0'
+      },
+      rules: {
+        state: [
+          {
+            required: true,
+            trigger: 'change',
+            message: '请选择退回'
+          }
+        ]
       }
     }
   },
@@ -66,7 +91,7 @@ export default {
   },
   methods: {
     submitUpload() {
-      this.uploadData.uploaderFiles.state = 2
+      this.uploadData.uploaderFiles.state = this.ruleForm.state
       this.$refs.upload.submit()
     },
     // 文件上传
@@ -90,6 +115,9 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+  .form_select{
+    width: 100%;
+  }
 	.importFile{
 		.md{
 			margin-bottom: 20px;

CallCenterWeb.UI/src/views/customerServiceManagement/orderListCustomerServiceJingdong/index.vue

@@ -39,7 +39,7 @@
       <el-input v-model="searchData.trackingNo" placeholder="请输入运单号" class="filter-item" />
       <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
       <el-button v-permission="'HY_bulk_submit'" type="primary" class="filter-item" @click="btn_bulk_submit">批量提交</el-button>
-      <el-button v-permission="'HY_bulk_goback'" type="primary" class="filter-item" @click="btn_bulk_goback">批量客服退回</el-button>
+      <el-button v-permission="'HY_bulk_goback'" type="primary" class="filter-item" @click="btn_bulk_goback">批量退回</el-button>
       <el-button v-permission="'HY_export'" type="primary" class="filter-item" @click="btn_export">导出</el-button>
       <el-button v-permission="'HY_import_submit'" type="primary" class="filter-item" @click="btn_import_submit">导入附件提交</el-button>
     </div>

CallCenterWeb.UI/src/views/customerServiceManagement/orderListCustomerServiceRhyme/index.vue

@@ -38,7 +38,7 @@
       <el-input v-model="searchData.customerPhone" placeholder="请输入客户手机号" class="filter-item" />
       <el-input v-model="searchData.trackingNo" placeholder="请输入运单号" class="filter-item" />
       <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
-      <el-button v-permission="'HY_bulk_goback'" type="primary" class="filter-item" @click="btn_bulk_goback">批量客服退回</el-button>
+      <el-button v-permission="'HY_bulk_goback'" type="primary" class="filter-item" @click="btn_bulk_goback">批量退回</el-button>
       <el-button v-permission="'HY_export'" type="primary" class="filter-item" @click="btn_export">导出</el-button>
       <el-button v-permission="'HY_import_submit'" type="primary" class="filter-item" @click="btn_import_submit">导入附件提交</el-button>
     </div>

CallCenterWeb.UI/src/views/customerServiceManagement/orderListCustomerServiceSF/index.vue

@@ -24,7 +24,7 @@
       <el-input v-model="searchData.trackingNo" placeholder="请输入运单号" class="filter-item" />
       <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
       <el-button v-permission="'HY_bulk_submit'" type="primary" class="filter-item" @click="btn_bulk_submit">批量提交</el-button>
-      <el-button v-permission="'HY_bulk_goback'" type="primary" class="filter-item" @click="btn_bulk_goback">批量客服退回</el-button>
+      <el-button v-permission="'HY_bulk_goback'" type="primary" class="filter-item" @click="btn_bulk_goback">批量退回</el-button>
       <el-button v-permission="'HY_import_submit'" type="primary" class="filter-item" @click="btn_import_submit">导入附件提交</el-button>
     </div>
     <el-tabs v-model="activeName" type="card" @tab-click="handleTabClick" >

CallCenterWeb.UI/src/views/customerServiceManagement/orderListCustomerServiceSTO/index.vue

@@ -39,7 +39,7 @@
       <el-input v-model="searchData.trackingNo" placeholder="请输入运单号" class="filter-item" />
       <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
       <el-button v-permission="'HY_bulk_submit'" type="primary" class="filter-item" @click="btn_bulk_submit">批量提交</el-button>
-      <el-button v-permission="'HY_bulk_goback'" type="primary" class="filter-item" @click="btn_bulk_goback">批量客服退回</el-button>
+      <el-button v-permission="'HY_bulk_goback'" type="primary" class="filter-item" @click="btn_bulk_goback">批量退回</el-button>
       <el-button v-permission="'HY_export'" type="primary" class="filter-item" @click="btn_export">导出</el-button>
       <el-button v-permission="'HY_import_submit'" type="primary" class="filter-item" @click="btn_import_submit">导入附件提交</el-button>
     </div>

CallCenterWeb.UI/src/views/customerServiceManagement/orderListCustomerServiceShanXiSF/index.vue

@@ -39,7 +39,7 @@
       <el-input v-model="searchData.trackingNo" placeholder="请输入运单号" class="filter-item" />
       <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
       <el-button v-permission="'HY_bulk_submit'" type="primary" class="filter-item" @click="btn_bulk_submit">批量提交</el-button>
-      <el-button v-permission="'HY_bulk_goback'" type="primary" class="filter-item" @click="btn_bulk_goback">批量客服退回</el-button>
+      <el-button v-permission="'HY_bulk_goback'" type="primary" class="filter-item" @click="btn_bulk_goback">批量退回</el-button>
       <el-button v-permission="'HY_export'" type="primary" class="filter-item" @click="btn_export">导出</el-button>
       <el-button v-permission="'HY_import_submit'" type="primary" class="filter-item" @click="btn_import_submit">导入附件提交</el-button>
     </div>

CallCenterWeb.UI/src/views/customerServiceManagement/orderListCustomerServiceXinXiangSF/index.vue

@@ -39,7 +39,7 @@
       <el-input v-model="searchData.trackingNo" placeholder="请输入运单号" class="filter-item" />
       <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
       <el-button v-permission="'HY_bulk_submit'" type="primary" class="filter-item" @click="btn_bulk_submit">批量提交</el-button>
-      <el-button v-permission="'HY_bulk_goback'" type="primary" class="filter-item" @click="btn_bulk_goback">批量客服退回</el-button>
+      <el-button v-permission="'HY_bulk_goback'" type="primary" class="filter-item" @click="btn_bulk_goback">批量退回</el-button>
       <el-button v-permission="'HY_export'" type="primary" class="filter-item" @click="btn_export">导出</el-button>
       <el-button v-permission="'HY_import_submit'" type="primary" class="filter-item" @click="btn_import_submit">导入附件提交</el-button>
     </div>

CallCenterWeb.UI/src/views/customerServiceManagement/orderListCustomerServiceYuantong/index.vue

@@ -39,7 +39,7 @@
       <el-input v-model="searchData.trackingNo" placeholder="请输入运单号" class="filter-item" />
       <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
       <el-button v-permission="'HY_bulk_submit'" type="primary" class="filter-item" @click="btn_bulk_submit">批量提交</el-button>
-      <el-button v-permission="'HY_bulk_goback'" type="primary" class="filter-item" @click="btn_bulk_goback">批量客服退回</el-button>
+      <el-button v-permission="'HY_bulk_goback'" type="primary" class="filter-item" @click="btn_bulk_goback">批量退回</el-button>
       <el-button v-permission="'HY_export'" type="primary" class="filter-item" @click="btn_export">导出</el-button>
       <el-button v-permission="'HY_import_submit'" type="primary" class="filter-item" @click="btn_import_submit">导入附件提交</el-button>
     </div>

CallCenterWeb.UI/src/views/customerServiceManagement/orderListCustomerServiceZhongtong/index.vue

@@ -39,7 +39,7 @@
       <el-input v-model="searchData.trackingNo" placeholder="请输入运单号" class="filter-item" />
       <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
       <el-button v-permission="'HY_bulk_submit'" type="primary" class="filter-item" @click="btn_bulk_submit">批量提交</el-button>
-      <el-button v-permission="'HY_bulk_goback'" type="primary" class="filter-item" @click="btn_bulk_goback">批量客服退回</el-button>
+      <el-button v-permission="'HY_bulk_goback'" type="primary" class="filter-item" @click="btn_bulk_goback">批量退回</el-button>
       <el-button v-permission="'HY_export'" type="primary" class="filter-item" @click="btn_export">导出</el-button>
       <el-button v-permission="'HY_import_submit'" type="primary" class="filter-item" @click="btn_import_submit">导入附件提交</el-button>
     </div>

CallCenterWeb.UI/src/views/customerServiceManagement/orderListLogistics/importGoback.vue

@@ -1,5 +1,18 @@
 <template>
   <div class="importFile">
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="80px">
+      <el-form-item label="退回" prop="state">
+        <el-select
+          v-model="ruleForm.state"
+          class="form_select"
+          filterable
+          placeholder="请选择退回"
+        >
+          <el-option label="退回上一级" value="0" />
+          <el-option label="退回销售" value="1" />
+        </el-select>
+      </el-form-item>
+    </el-form>
     <el-alert title="选取的EXCEL文件需要严格按照下载的EXCEL模板进行填写！选择好文件后点击导入即可！" type="warning" class="md" show-icon/>
     <el-row>
       <el-col :lg="7" class="md">
@@ -56,15 +69,29 @@ export default {
         },
         uploadUrl: this.$store.getters.serverConfig.BASE_API + 'api/KFOrder/importorderbackexcel',
         uploaderFiles: {// 上传文件的参数
+          state: ''
         },
         fileList: [], // 展示文件的数据
       },
+      ruleForm: {
+        state: '0'
+      },
+      rules: {
+        state: [
+          {
+            required: true,
+            trigger: 'change',
+            message: '请选择退回'
+          }
+        ]
+      }
     }
   },
   created() {
   },
   methods: {
     submitUpload() {
+      this.uploadData.uploaderFiles.state = this.ruleForm.state
       this.$refs.upload.submit()
     },
     // 文件上传
@@ -88,7 +115,10 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-	.importFile{
+  .form_select{
+    width: 100%;
+  }
+  .importFile{
 		.md{
 			margin-bottom: 20px;
 		}

CallCenterWeb.UI/src/views/customerServiceManagement/orderListLogistics/index.vue

@@ -95,7 +95,7 @@
       >运单号导入</el-button> -->
       <!-- <el-button v-permission="'HY_merge'" type="primary" class="filter-item" @click="btn_merge">合并</el-button> -->
       <el-button v-permission="'HY_bulk_logistics'" type="primary" class="filter-item" @click="btn_bulk_logistics">批量分物流</el-button>
-      <el-button v-permission="'HY_bulk_goback'" type="primary" class="filter-item" @click="btn_bulk_goback">批量客服退回</el-button>
+      <el-button v-permission="'HY_bulk_goback'" type="primary" class="filter-item" @click="btn_bulk_goback">批量退回</el-button>
       <el-button v-permission="'HY_export'" type="primary" class="filter-item" @click="btn_export">导出</el-button>
       <el-button v-permission="'HY_import_goback'" type="primary" class="filter-item" @click="btn_import_goback">导入附件退回</el-button>
     </div>

CallCenterWeb.UI/src/views/customerServiceManagement/orderListPending/importGoback.vue

@@ -1,5 +1,18 @@
 <template>
   <div class="importFile">
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="80px">
+      <el-form-item label="退回" prop="state">
+        <el-select
+          v-model="ruleForm.state"
+          class="form_select"
+          filterable
+          placeholder="请选择退回"
+        >
+          <el-option label="退回上一级" value="0" />
+          <el-option label="退回销售" value="1" />
+        </el-select>
+      </el-form-item>
+    </el-form>
     <el-alert title="选取的EXCEL文件需要严格按照下载的EXCEL模板进行填写！选择好文件后点击导入即可！" type="warning" class="md" show-icon/>
     <el-row>
       <el-col :lg="7" class="md">
@@ -56,9 +69,21 @@ export default {
         },
         uploadUrl: this.$store.getters.serverConfig.BASE_API + 'api/KFOrder/importorderbackexcel',
         uploaderFiles: {// 上传文件的参数
-        
+          state: ''
         },
         fileList: [], // 展示文件的数据
+      },
+      ruleForm: {
+        state: '0'
+      },
+      rules: {
+        state: [
+          {
+            required: true,
+            trigger: 'change',
+            message: '请选择退回'
+          }
+        ]
       }
     }
   },
@@ -66,6 +91,7 @@ export default {
   },
   methods: {
     submitUpload() {
+      this.uploadData.uploaderFiles.state = this.ruleForm.state
       this.$refs.upload.submit()
     },
     // 文件上传
@@ -89,6 +115,9 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+  .form_select{
+    width: 100%;
+  }
 	.importFile{
 		.md{
 			margin-bottom: 20px;