问题修改

CallCenterWeb.UI/src/views/afterSaleManagement/addAfterSale/afterSale.vue

@@ -218,7 +218,6 @@ export default {
   },
   created() {
     this.getCommodityTypeSelect()
-    this.getAfterSaleReasons()
     Promise.all([
     ]).then(() => {
       if (this.rowid) {
@@ -363,11 +362,11 @@ export default {
       })
     },
     //售后原因类型
-    getAfterSaleReasons() {
+    getAfterSaleReasons(code) {
       return new Promise(resolve=>{
         const params={
-          isleaf:true,
-          code:'AfterSaleReasons'
+          isleaf: true,
+          code: code
         }
         getDictionaryValueList(params).then(response=>{
           if(response.state.toLowerCase() === 'success'){
@@ -387,13 +386,19 @@ export default {
     },
     //改变售后类型
     changeType(val) {
-      // if(val === "5") {
-      //   this.$refs.oldCommodityTable.clearSelection()
-      // } else {
-      //   this.oldCommodityTableData.forEach((row,index)=>{
-      //     this.$refs.oldCommodityTable.toggleRowSelection(row, true)
-      //   })
-      // }
+      if (val == "1") {
+        // 调换
+        this.getAfterSaleReasons("AfterSaleTypeSwap")
+      } else if (val == "2") {
+        // 退货
+        this.getAfterSaleReasons("AfterSaleTypeRefund")
+      } else if (val == "4") {
+        // 对发货
+        this.getAfterSaleReasons("AfterSaleTypeOnDelivery")
+      } else if (val == "5") {
+        // 补发货
+        this.getAfterSaleReasons("AfterSaleTypeReShipment")
+      }
     },
     // 获取金额总数
     getTotalAmountFun() {
@@ -428,6 +433,6 @@ export default {
   width: 100%;
 }
 .form_input_number {
-  width: 100%; 
+  width: 100%;
 }
 </style>

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

@@ -390,6 +390,6 @@ export default {
   width: 100%;
 }
 .form_input_number {
-  width: 100%; 
+  width: 100%;
 }
 </style>

CallCenterWeb.UI/src/views/afterSaleManagement/afterSaleList/addOrEdit.vue

@@ -409,7 +409,7 @@ export default {
         idsQuantity.push(this.oldDetailListSelection[i].F_ProductId + ',' + this.oldDetailListSelection[i].F_Count)
       }
       this.ruleForm.F_OldDetailList = idsQuantity.join('|')
-    }, 
+    },
   }
 };
 </script>

CallCenterWeb.UI/src/views/afterSaleManagement/afterSaleOrderList/edit.vue

@@ -42,8 +42,8 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="商品" prop="productName">
-            <el-select v-model="commoditySearchData.productName" class="filter-item" value-key="F_ProductId" clearable placeholder="请选择商品" @change="commodityListChange">
-              <el-option v-for="item in commodityListLists" :key="item.F_ProductId" :label="item.F_ProductName" :value="item"> </el-option>
+            <el-select v-model="commoditySearchData.productName" class="filter-item" value-key="F_ProductId" clearable filterable placeholder="请选择商品" @change="commodityListChange">
+              <el-option v-for="item in commodityListLists" :key="item.F_ProductId" :label="item.F_ProductName" :value="item"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
@@ -256,9 +256,9 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-form-item label="会员备注" prop="F_MemberNotes">
+      <!-- <el-form-item label="会员备注" prop="F_MemberNotes">
         <el-input :autosize="{ minRows: 4 }" v-model="ruleForm.F_MemberNotes" type="textarea" placeholder="请输入会员备注" />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="备注" prop="F_Remark">
         <el-input :autosize="{ minRows: 4 }" v-model="ruleForm.F_Remark" type="textarea" placeholder="请输入备注" />
       </el-form-item>
@@ -428,7 +428,7 @@ export default {
         F_Belong: 0, //否 number 归属人id
         F_BelongName: "", //否 string 归属人名称
         F_Remark: "", //否 string 备注
-        F_MemberNotes: "", // 会员备注
+        // F_MemberNotes: "", // 会员备注
         F_VipId: "", // 关联会员id
         F_MediaName: "", // 媒体名称
         F_Media: 0, // 媒体
@@ -1062,7 +1062,7 @@ export default {
         this.ruleForm.F_Belong = res.F_Belong //归属人id
         this.ruleForm.F_BelongName = res.F_BelongName //归属人名称
         this.ruleForm.F_Remark = res.F_Remark //备注
-        this.ruleForm.F_MemberNotes = res.F_MemberNotes //会员备注
+        // this.ruleForm.F_MemberNotes = res.F_MemberNotes //会员备注
         this.totalAmount = res.F_TotlePrice // 应付金额
         this.ruleForm.F_VipId = res.F_VipId // 会员id
         this.ruleForm.F_Media = res.F_Media // 媒体id

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

@@ -12,7 +12,7 @@
           <el-option label="对发货" value="4"></el-option>
           <el-option label="补发货" value="5"></el-option>
           <!-- <el-option label="补差额" value="6"></el-option> -->
-          <el-option label="错发" value="7"></el-option>
+          <!-- <el-option label="错发" value="7"></el-option> -->
           <!-- <el-option label="漏发" value="8"></el-option> -->
         </el-select>
       </el-form-item>
@@ -209,7 +209,6 @@ export default {
   },
   created() {
     this.getCommodityTypeSelect()
-    this.getAfterSaleReasons()
     Promise.all([
     ]).then(() => {
       if (this.rowid) {
@@ -349,11 +348,11 @@ export default {
       })
     },
     //售后原因类型
-    getAfterSaleReasons() {
+    getAfterSaleReasons(code) {
       return new Promise(resolve=>{
         const params={
-          isleaf:true,
-          code:'AfterSaleReasons'
+          isleaf: true,
+          code: code
         }
         getDictionaryValueList(params).then(response=>{
           if(response.state.toLowerCase() === 'success'){
@@ -373,13 +372,26 @@ export default {
     },
     // 售后类型改变
     changeType(val) {
-      if(val === "5") {
-        this.$refs.oldCommodityTable.clearSelection()
-      } else {
-        this.oldCommodityTableData.forEach((row,index)=>{
-          this.$refs.oldCommodityTable.toggleRowSelection(row, true)
-        })
+      if (val == "1") {
+        // 调换
+        this.getAfterSaleReasons("AfterSaleTypeSwap")
+      } else if (val == "2") {
+        // 退货
+        this.getAfterSaleReasons("AfterSaleTypeRefund")
+      } else if (val == "4") {
+        // 对发货
+        this.getAfterSaleReasons("AfterSaleTypeOnDelivery")
+      } else if (val == "5") {
+        // 补发货
+        this.getAfterSaleReasons("AfterSaleTypeReShipment")
       }
+      // if(val === "5") {
+      //   this.$refs.oldCommodityTable.clearSelection()
+      // } else {
+      //   this.oldCommodityTableData.forEach((row,index)=>{
+      //     this.$refs.oldCommodityTable.toggleRowSelection(row, true)
+      //   })
+      // }
     },
   }
 };
@@ -390,6 +402,6 @@ export default {
   width: 100%;
 }
 .form_input_number {
-  width: 100%; 
+  width: 100%;
 }
 </style>

CallCenterWeb.UI/src/views/callScreen/components/createOrder.vue

@@ -48,7 +48,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="商品" prop="productName">
-                <el-select v-model="commoditySearchData.productName" class="form_select" value-key="F_ProductId" clearable placeholder="请选择商品" @change="commodityListChange">
+                <el-select v-model="commoditySearchData.productName" class="form_select" value-key="F_ProductId" clearable filterable placeholder="请选择商品" @change="commodityListChange">
                   <el-option v-for="item in commodityListLists" :key="item.F_ProductId" :label="item.F_ProductName" :value="item" />
                 </el-select>
               </el-form-item>
@@ -293,9 +293,9 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-form-item label="会员备注" prop="F_MemberNotes">
+          <!-- <el-form-item label="会员备注" prop="F_MemberNotes">
             <el-input :autosize="{ minRows: 4 }" v-model="ruleForm.F_MemberNotes" type="textarea" placeholder="请输入会员备注" />
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="备注" prop="F_Remark">
             <el-input :autosize="{ minRows: 4 }" v-model="ruleForm.F_Remark" type="textarea" placeholder="请输入备注" />
           </el-form-item>
@@ -461,7 +461,7 @@ export default {
         F_Belong: 0, // 否 number 归属人id
         F_BelongName: "", // 否 string 归属人名称,
         F_VipId: "", // 关联会员id
-        F_MemberNotes: "", // 会员备注
+        // F_MemberNotes: "", // 会员备注
         F_IsPayment: 0, // 是否提前付款
         F_RecommenderTel: "", // 推荐人手机号
         F_MediaName: "", // 媒体名称

CallCenterWeb.UI/src/views/callScreen/components/remarkList.vue

@@ -69,7 +69,6 @@ export default {
   },
   created () {
     if (this.callinNum) {
-      this.ruleForm.F_Phone = this.callinNum
       this.getDetail(this.callinNum);
     }
   },
@@ -118,7 +117,7 @@ export default {
               orderids: id,
             };
             deleteAfterSaleListChatLog(data).then((response) => {
-              if (response.state.toLowerCase() === "success") {                
+              if (response.state.toLowerCase() === "success") {
                 this.getList()
                 this.$message.success("删除成功!");
               }

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

@@ -2,42 +2,36 @@
   <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-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-alert title="选取的EXCEL文件需要严格按照下载的EXCEL模板进行填写！选择好文件后点击导入即可！" type="warning" class="md" show-icon />
     <el-row>
       <el-col :lg="7" class="md">
-        <a :href="downloadUrl" download="退回导入模板.xlsx" class="download_btn" title="点击下载EXCEL模板" rel="nofollow">
-          下载EXCEL模板
-        </a>
+        <a :href="downloadUrl" download="退回导入模板.xlsx" class="download_btn" title="点击下载EXCEL模板" rel="nofollow"> 下载EXCEL模板 </a>
       </el-col>
       <el-col :lg="17" class="md">
         <el-upload
           ref="upload"
           :limit="1"
           :file-list="uploadData.fileList"
-          :action= "uploadData.uploadUrl"
-          :data = "uploadData.uploaderFiles"
+          :action="uploadData.uploadUrl"
+          :data="uploadData.uploaderFiles"
           :on-success="uploadSuccess"
           :on-error="uploadError"
           :on-exceed="uploadExceed"
           :auto-upload="false"
-          :headers = "uploadData.uploadHeader"
+          :headers="uploadData.uploadHeader"
           class="uploadFiles"
           list-type="text"
           name="upFile"
-          accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel">
+          accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
+        >
           <el-button slot="trigger" size="small" type="primary">选取EXCEL文件</el-button>
-          <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">导入</el-button>
+          <el-button style="margin-left: 10px" size="small" type="success" @click="submitUpload">导入</el-button>
           <!-- <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div> -->
         </el-upload>
       </el-col>
@@ -46,49 +40,50 @@
 </template>
 
 <script>
-import { getToken } from '@/utils/auth'
+import { getToken } from "@/utils/auth"
 
 export default {
-  name: 'ImportFile',
+  name: "ImportFile",
   props: {
     rowid: {
       type: String,
-      default: ''
+      default: "",
     },
     layerid: {
       type: String,
-      default: ''
-    }
+      default: "",
+    },
   },
   data() {
     return {
-      downloadUrl: '/static/xls/importGoback.xlsx',
-      uploadData: {// 文件上传数据
+      downloadUrl: "/static/xls/importGoback.xlsx",
+      uploadData: {
+        // 文件上传数据
         uploadHeader: {
           Authorization: getToken(),
         },
-        uploadUrl: this.$store.getters.serverConfig.BASE_API + 'api/KFOrder/importorderbackexcel',
-        uploaderFiles: {// 上传文件的参数
-          state: '',
+        uploadUrl: this.$store.getters.serverConfig.BASE_API + "api/KFOrder/importorderbackexcel",
+        uploaderFiles: {
+          // 上传文件的参数
+          state: "",
         },
         fileList: [], // 展示文件的数据
       },
       ruleForm: {
-        state: '0'
+        state: "0",
       },
       rules: {
         state: [
           {
             required: true,
-            trigger: 'change',
-            message: '请选择退回'
-          }
-        ]
-      }
+            trigger: "change",
+            message: "请选择退回",
+          },
+        ],
+      },
     }
   },
-  created() {
-  },
+  created() {},
   methods: {
     submitUpload() {
       this.uploadData.uploaderFiles.state = this.ruleForm.state
@@ -96,63 +91,63 @@ export default {
     },
     // 文件上传
     uploadSuccess(response, file, fileList) {
-      if (response.state.toLowerCase() === 'success') {
+      if (response.state.toLowerCase() === "success") {
         this.$parent.$layer.close(this.layerid)
         this.$parent.getList() // 重新加载父级数据
-        this.$message.success('恭喜你，导入成功!')
+        this.$message.success("恭喜你，导入成功!")
       } else {
         this.$message.error(response.message)
       }
     },
     uploadExceed(file, fileList) {
-      this.$message.warning('只能选择一个文件!')
+      this.$message.warning("只能选择一个文件!")
     },
     uploadError(err, file, fileList) {
       this.$message.error(err)
-    }
-  }
+    },
+  },
 }
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .form_select{
-    width: 100%;
+.form_select {
+  width: 100%;
+}
+.importFile {
+  .md {
+    margin-bottom: 20px;
   }
-	.importFile{
-		.md{
-			margin-bottom: 20px;
-		}
-		.download_btn{
-			display: inline-block;
-			line-height: 1;
-			white-space: nowrap;
-			cursor: pointer;
-			border: 1px solid #dcdfe6;
-			-webkit-appearance: none;
-			text-align: center;
-			-webkit-box-sizing: border-box;
-			box-sizing: border-box;
-			outline: 0;
-			margin: 0;
-			-webkit-transition: .1s;
-			transition: .1s;
-			font-weight: 500;
-			padding: 9px 15px;
-			font-size: 12px;
-			border-radius: 4px;
-			color: #fff;
-			background-color: #409EFF;
-			border-color: #409EFF;
-			&:hover{
-				background: #66b1ff;
-				border-color: #66b1ff;
-				color: #fff;
-			}
-			&:active{
-				background: #66b1ff;
-				border-color: #66b1ff;
-				color: #fff;
-			}
-		}
-	}
+  .download_btn {
+    display: inline-block;
+    line-height: 1;
+    white-space: nowrap;
+    cursor: pointer;
+    border: 1px solid #dcdfe6;
+    -webkit-appearance: none;
+    text-align: center;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    outline: 0;
+    margin: 0;
+    -webkit-transition: 0.1s;
+    transition: 0.1s;
+    font-weight: 500;
+    padding: 9px 15px;
+    font-size: 12px;
+    border-radius: 4px;
+    color: #fff;
+    background-color: #409eff;
+    border-color: #409eff;
+    &:hover {
+      background: #66b1ff;
+      border-color: #66b1ff;
+      color: #fff;
+    }
+    &:active {
+      background: #66b1ff;
+      border-color: #66b1ff;
+      color: #fff;
+    }
+  }
+}
 </style>

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

@@ -331,7 +331,7 @@ export default {
     btn_export() {
       const SearchStartTime = this.searchData.searchTime[0] == undefined ? '' : this.searchData.searchTime[0]
       const SearchEndTime = this.searchData.searchTime[1] == undefined ? '' : this.searchData.searchTime[1]
-      window.location.href = this.$store.getters.serverConfig.BASE_API + 'api/order/getorderlistbykfpage?isdc=1' + '&F_State=' + this.activeName + '&SearchStartTime=' + SearchStartTime + '&SearchEndTime=' + SearchEndTime + '&F_Express=' + '京东快递'
+      window.location.href = this.$store.getters.serverConfig.BASE_API + 'api/order/getorderlistbykfpage?isdc=1' + '&F_State=' + this.activeName + '&SearchStartTime=' + SearchStartTime + '&SearchEndTime=' + SearchEndTime + '&F_Express=' + 'EMS'
     },
     // 导入附件提交
     btn_import_submit() {

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

@@ -332,7 +332,7 @@ export default {
     btn_export() {
       const SearchStartTime = this.searchData.searchTime[0] == undefined ? '' : this.searchData.searchTime[0]
       const SearchEndTime = this.searchData.searchTime[1] == undefined ? '' : this.searchData.searchTime[1]
-      window.location.href = this.$store.getters.serverConfig.BASE_API + 'api/order/getorderlistbykfpage?isdc=1' + '&F_State=' + this.activeName + '&SearchStartTime=' + SearchStartTime + '&SearchEndTime=' + SearchEndTime + '&F_Express=' + '韵达快递'
+      window.location.href = this.$store.getters.serverConfig.BASE_API + 'api/order/getorderlistbykfpage?isdc=1' + '&F_State=' + this.activeName + '&SearchStartTime=' + SearchStartTime + '&SearchEndTime=' + SearchEndTime + '&F_Express=' + '京东袜子'
     },
     // 导入附件提交
     btn_import_submit() {

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

@@ -333,7 +333,7 @@ export default {
     btn_export() {
       const SearchStartTime = this.searchData.searchTime[0] == undefined ? '' : this.searchData.searchTime[0]
       const SearchEndTime = this.searchData.searchTime[1] == undefined ? '' : this.searchData.searchTime[1]
-      window.location.href = this.$store.getters.serverConfig.BASE_API + 'api/order/getorderlistbykfpage?isdc=1' + '&F_State=' + this.activeName + '&SearchStartTime=' + SearchStartTime + '&SearchEndTime=' + SearchEndTime + '&F_Express=' + '申通快递'
+      window.location.href = this.$store.getters.serverConfig.BASE_API + 'api/order/getorderlistbykfpage?isdc=1' + '&F_State=' + this.activeName + '&SearchStartTime=' + SearchStartTime + '&SearchEndTime=' + SearchEndTime + '&F_Express=' + '汇通袜子'
     },
     // 导入附件提交
     btn_import_submit() {

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

@@ -333,7 +333,7 @@ export default {
     btn_export() {
       const SearchStartTime = this.searchData.searchTime[0] == undefined ? '' : this.searchData.searchTime[0]
       const SearchEndTime = this.searchData.searchTime[1] == undefined ? '' : this.searchData.searchTime[1]
-      window.location.href = this.$store.getters.serverConfig.BASE_API + 'api/order/getorderlistbykfpage?isdc=1' + '&F_State=' + this.activeName + '&SearchStartTime=' + SearchStartTime + '&SearchEndTime=' + SearchEndTime + '&F_Express=' + '圆通快递'
+      window.location.href = this.$store.getters.serverConfig.BASE_API + 'api/order/getorderlistbykfpage?isdc=1' + '&F_State=' + this.activeName + '&SearchStartTime=' + SearchStartTime + '&SearchEndTime=' + SearchEndTime + '&F_Express=' + '汇通快递'
     },
     // 导入附件提交
     btn_import_submit() {

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

@@ -334,7 +334,7 @@ export default {
     btn_export() {
       const SearchStartTime = this.searchData.searchTime[0] == undefined ? '' : this.searchData.searchTime[0]
       const SearchEndTime = this.searchData.searchTime[1] == undefined ? '' : this.searchData.searchTime[1]
-      window.location.href = this.$store.getters.serverConfig.BASE_API + 'api/order/getorderlistbykfpage?isdc=1' + '&F_State=' + this.activeName + '&SearchStartTime=' + SearchStartTime + '&SearchEndTime=' + SearchEndTime + '&F_Express=' + '中通快递'
+      window.location.href = this.$store.getters.serverConfig.BASE_API + 'api/order/getorderlistbykfpage?isdc=1' + '&F_State=' + this.activeName + '&SearchStartTime=' + SearchStartTime + '&SearchEndTime=' + SearchEndTime + '&F_Express=' + '邮政小包'
     },
     // 导入附件提交
     btn_import_submit() {

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

@@ -64,7 +64,7 @@
         <template slot-scope="scope">{{ scope.row | judgmentAddress }}</template>
       </el-table-column>
       <el-table-column prop="F_PayType" label="付款类型" align="center" />
-      <el-table-column prop="F_RealPrice" label="付款金额" align="center" sortable min-width="100" />
+      <el-table-column prop="F_RealPrice" label="付款金额" align="center" sortable min-width="100"/>
       <el-table-column prop="F_AddDes" label="送货说明" align="center" />
       <el-table-column prop="F_AddUserName" label="下单员工" align="center" />
       <el-table-column prop="F_BelongName" label="归属员工" align="center" />

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

@@ -1,98 +1,23 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <el-date-picker
-        v-model="searchTime"
-        :picker-options="pickerOptions"
-        class="filter-item"
-        type="daterange"
-        format="yyyy年MM月dd日"
-        value-format="yyyy-MM-dd"
-        unlink-panels
-        range-separator="至"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-      />
-      <el-date-picker
-        v-model="waybillTime"
-        :picker-options="pickerOptions"
-        class="filter-item"
-        type="daterange"
-        format="yyyy年MM月dd日"
-        value-format="yyyy-MM-dd"
-        unlink-panels
-        range-separator="至"
-        start-placeholder="物流开始日期"
-        end-placeholder="物流结束日期"
-      />
-      <el-cascader
-        ref="myCascader"
-        v-model="searchData.provinceCity"
-        :options="provinceCityDatas"
-        :props="props"
-        placeholder="请选择地区"
-        class="form_select area"
-        clearable
-        change-on-select
-        @change="handleItemChange"
-      />
-      <el-input v-model="searchData.minprice" placeholder="请输入最低金额" class="filter-item" />
-      <el-input v-model="searchData.maxprice" placeholder="请输入最高金额" class="filter-item" />
-      <el-select
-        v-model="searchData.F_AddDes"
-        placeholder="请选择送货说明"
-        class="form_select"
-        clearable
-      >
-        <el-option
-          v-for="item in addDesList"
-          :key="item.F_Value"
-          :label="item.F_Value"
-          :value="item.F_Value"
-        />
+      <el-date-picker v-model="searchTime" :picker-options="pickerOptions" class="filter-item" type="daterange" format="yyyy年MM月dd日" value-format="yyyy-MM-dd" unlink-panels range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
+      <el-date-picker v-model="waybillTime" :picker-options="pickerOptions" class="filter-item" type="daterange" format="yyyy年MM月dd日" value-format="yyyy-MM-dd" unlink-panels range-separator="至" start-placeholder="物流开始日期" end-placeholder="物流结束日期" />
+      <el-cascader ref="myCascader" v-model="searchData.provinceCity" :options="provinceCityDatas" :props="props" placeholder="请选择地区" class="form_select area" clearable change-on-select @change="handleItemChange" />
+      <!-- <el-input v-model="searchData.minprice" placeholder="请输入最低金额" class="filter-item" />
+      <el-input v-model="searchData.maxprice" placeholder="请输入最高金额" class="filter-item" /> -->
+      <el-select v-model="searchData.F_AddDes" placeholder="请选择送货说明" class="form_select filter-item" clearable>
+        <el-option v-for="item in addDesList" :key="item.F_Value" :label="item.F_Value" :value="item.F_Value" />
       </el-select>
       <el-input v-model="searchData.adFrom" placeholder="请输入消息来源" class="filter-item" />
-      <el-select
-        v-model="searchData.type"
-        class="filter-item"
-        filterable
-        clearable
-        placeholder="请选择订单类型"
-      >
-        <el-option
-          v-for="item in orderType"
-          :key="item.F_Value"
-          :label="item.F_Value"
-          :value="item.F_Value"
-        />
+      <el-select v-model="searchData.type" class="filter-item" filterable clearable placeholder="请选择订单类型">
+        <el-option v-for="item in orderType" :key="item.F_Value" :label="item.F_Value" :value="item.F_Value" />
       </el-select>
-      <el-select
-        v-model="searchData.express"
-        class="form_select"
-        filterable
-        clearable
-        placeholder="请选择快递"
-      >
-        <el-option
-          v-for="item in expressList"
-          :key="item.F_Value"
-          :label="item.F_Value"
-          :value="item.F_Value"
-        />
+      <el-select v-model="searchData.express" class="form_select filter-item" filterable clearable placeholder="请选择快递">
+        <el-option v-for="item in expressList" :key="item.F_Value" :label="item.F_Value" :value="item.F_Value" />
       </el-select>
-      <el-select
-        v-model="searchData.logisticsStatus"
-        class="form_select"
-        filterable
-        clearable
-        placeholder="请选择物流状态"
-      >
-        <el-option
-          v-for="item in logisticsList"
-          :key="item.F_Value"
-          :label="item.F_Remark"
-          :value="item.F_Value"
-        />
+      <el-select v-model="searchData.logisticsStatus" class="form_select filter-item" filterable clearable placeholder="请选择物流状态">
+        <el-option v-for="item in logisticsList" :key="item.F_Value" :label="item.F_Remark" :value="item.F_Value" />
       </el-select>
       <el-input v-model="searchData.id" placeholder="请输入订单编号" class="filter-item" />
       <!-- <el-input v-model="searchData.customer" placeholder="请输入客户姓名" class="filter-item" />
@@ -124,29 +49,18 @@
     <div>
       <span>订单数量：{{ pageParams.total }}</span>
     </div>
-    <el-table
-      v-loading="loading"
-      :data="dataLists"
-      border
-      stripe
-      @selection-change="handleSelectionChange"
-      row-key="F_Id"
-    >
+    <el-table v-loading="loading" :data="dataLists" border stripe @selection-change="handleSelectionChange" row-key="F_Id">
       <el-table-column type="selection" :reserve-selection="true"></el-table-column>
       <el-table-column type="index" label="编号" align="center" fixed width="80" />
       <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" />
       <el-table-column label="订购商品" align="center" min-width>
-        <template slot-scope="scope">{{ scope.row.OrderDetailList | judgmentOrderGoods}}</template>
+        <template slot-scope="scope">{{ scope.row.OrderDetailList | judgmentOrderGoods }}</template>
       </el-table-column>
       <el-table-column prop="F_AddTime" label="下单日期" align="center" />
       <!-- <el-table-column label="订单状态" align="center">
@@ -155,31 +69,23 @@
       <el-table-column label="地址" align="center">
         <template slot-scope="scope">{{ scope.row | judgmentAddress }}</template>
       </el-table-column>
-      <el-table-column prop="F_PayType" label="付款类型" align="center"/>
-      <el-table-column prop="F_RealPrice" label="付款金额" align="center"/>
-      <el-table-column prop="F_AddDes" label="送货说明" align="center"/>
+      <el-table-column prop="F_PayType" label="付款类型" align="center" />
+      <el-table-column prop="F_RealPrice" label="付款金额" align="center" sortable min-width="100"/>
+      <el-table-column prop="F_AddDes" label="送货说明" align="center" />
       <el-table-column prop="F_AddUserName" label="下单员工" align="center" />
       <!-- <el-table-column prop="F_BelongName" label="归属员工" align="center" /> -->
       <el-table-column prop="F_Type" label="订单类型" align="center" />
       <el-table-column prop="F_TrackingNo" label="运单号" align="center" />
       <el-table-column prop="F_Waybill" label="物流操作时间" align="center" />
-      <el-table-column label="物流状态" align="center" >
+      <el-table-column label="物流状态" align="center">
         <template slot-scope="scope">
           {{ scope.row.F_Status | judgmentStatusName }}
         </template>
       </el-table-column>
       <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
         <template slot-scope="scope">
-          <el-button
-            v-permission="'HY_express'"
-            type="text"
-            @click="btn_express(scope.row.F_Id)"
-          >快递信息</el-button>
-          <el-button
-            v-permission="'HY_goback'"
-            type="text"
-            @click="btn_goback(scope.row.F_Id)"
-          >退回</el-button>
+          <el-button v-permission="'HY_express'" type="text" @click="btn_express(scope.row.F_Id)">快递信息</el-button>
+          <el-button v-permission="'HY_goback'" type="text" @click="btn_goback(scope.row.F_Id)">退回</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -195,82 +101,82 @@
 </template>
 
 <script>
-import { getDictionaryValueList, getProviceCityById } from '@/api/commonAPI'
-import { getOrderListCustomerService } from "@/api/customerServiceManagement/orderListCustomerService";
-import { pickerOptions, formatterContent } from "@/utils";
-import importExpress from './importExpress';
-import goback from "./goback";
-import express from './express';
+import { getDictionaryValueList, getProviceCityById } from "@/api/commonAPI"
+import { getOrderListCustomerService } from "@/api/customerServiceManagement/orderListCustomerService"
+import { pickerOptions, formatterContent } from "@/utils"
+import importExpress from "./importExpress"
+import goback from "./goback"
+import express from "./express"
 import detail from "@/views/orderManagement/orderList/detail"
-import Pagination from "@/components/Pagination"; // 对el-pagination 二次封装
+import Pagination from "@/components/Pagination" // 对el-pagination 二次封装
 
 export default {
   name: "OrderListCustomerService",
   components: {
-    Pagination
+    Pagination,
   },
   filters: {
-    judgmentStateName (status) {
+    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]
     },
-    judgmentOrderGoods (status) {
-      let orderGoodsNameQuantity = ''
+    judgmentOrderGoods(status) {
+      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)
       return orderGoodsNameQuantity
     },
-    judgmentAddress (data) {
-      let addProvince = data.F_AddProvince === null ? '' : data.F_AddProvince //省
-      let addCity = data.F_AddCity === null ? '' : data.F_AddCity //市
-      let addArea = data.F_AddArea === null ? '' : data.F_AddArea //县/区
-      let addTown = data.F_AddTown === null ? '' : data.F_AddTown //乡/镇
-      let address = data.F_Address === null ? '' : data.F_Address //详细地址
+    judgmentAddress(data) {
+      let addProvince = data.F_AddProvince === null ? "" : data.F_AddProvince //省
+      let addCity = data.F_AddCity === null ? "" : data.F_AddCity //市
+      let addArea = data.F_AddArea === null ? "" : data.F_AddArea //县/区
+      let addTown = data.F_AddTown === null ? "" : data.F_AddTown //乡/镇
+      let address = data.F_Address === null ? "" : data.F_Address //详细地址
       let addressStr = addProvince + addCity + addArea + addTown + address // 地址
       return addressStr
     },
     judgmentStatusName(status) {
       const statusMap = {
-        '0': '未发出',
-        '1': '未签收',
-        '2': '签收',
-        '3': '改代收',
-        '4': '拒收',
+        0: "未发出",
+        1: "未签收",
+        2: "签收",
+        3: "改代收",
+        4: "拒收",
       }
       return statusMap[status]
     },
   },
-  data () {
+  data() {
     return {
       loading: false,
       searchData: {
-        adFrom: '', //消息/广告媒体来源
-        type: '', //订单类型
-        id: '', //订单号
-        customer: '', //客户姓名
-        customerPhone: '', //客户手机号
-        trackingNo: '', //运单号
-        payState: '', //交易状态
+        adFrom: "", //消息/广告媒体来源
+        type: "", //订单类型
+        id: "", //订单号
+        customer: "", //客户姓名
+        customerPhone: "", //客户手机号
+        trackingNo: "", //运单号
+        payState: "", //交易状态
         provinceCity: [], // 省市县
-        minprice: '', // 最低金额
-        maxprice: '', // 最高金额
-        F_AddDes: '', // 送货说明
-        express: '', //快递
-        logisticsStatus: '', //物流状态
-        warehousing: '', // 是否入库
+        minprice: "", // 最低金额
+        maxprice: "", // 最高金额
+        F_AddDes: "", // 送货说明
+        express: "", //快递
+        logisticsStatus: "", //物流状态
+        warehousing: "", // 是否入库
       },
       searchTime: [], //订单时间
       waybillTime: [], //物流时间
@@ -279,32 +185,32 @@ export default {
       provinceCityText: [], // 省市下拉绑定的值
       props: {
         // 自定义省市下拉数据的key值
-        value: 'id',
-        label: 'text',
-        children: 'children'
+        value: "id",
+        label: "text",
+        children: "children",
       },
       addDesList: [], // 送货说明
       pickerOptions, // 日期数据
       pageParams: {
         pageindex: 1, // 当前第几页
         pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
-        total: 0 // 总共多少数据
+        total: 0, // 总共多少数据
       },
       dataLists: [], // 列表数据
       multipleSelection: [], // 选中的数据
       selectedId: [], // 选中的数据的id
-      orderType: [],//订单类型
+      orderType: [], //订单类型
       logisticsList: [], //物流状态
       expressList: [], //快递
       selectOrderId: [], //合并订单id
-    };
+    }
   },
   watch: {
     searchTime(newVal, oldVal) {
       !newVal && (this.searchTime = [])
-    }
+    },
   },
-  created () {
+  created() {
     if (this.$route.params.id) {
       this.activeName = this.$route.params.id
     }
@@ -315,16 +221,16 @@ export default {
     this.getAddDesList()
     this.getLogistics()
     this.getExpress()
-    document.onkeyup = e => {
+    document.onkeyup = (e) => {
       if (e.keyCode === 13) {
-        this.getList();
+        this.getList()
       }
-    };
+    }
   },
   methods: {
-    getList () {
-      this.loading = true;
-      return new Promise(resolve => {
+    getList() {
+      this.loading = true
+      return new Promise((resolve) => {
         const params = {
           F_State: this.activeName, //订单状态
           pageindex: 1, // int 第几页
@@ -335,11 +241,11 @@ export default {
           F_Customer: this.searchData.customer, //客户姓名
           F_CustomerPhone: this.searchData.customerPhone, //客户手机号
           F_TrackingNo: this.searchData.trackingNo, //运单号
-          SearchStartTime: this.searchTime[0] == null ? '' : this.searchTime[0], //添加开始时间
-          SearchEndTime: this.searchTime[1] == null ? '' : this.searchTime[1], //添加结束时间
+          SearchStartTime: this.searchTime[0] == null ? "" : this.searchTime[0], //添加开始时间
+          SearchEndTime: this.searchTime[1] == null ? "" : this.searchTime[1], //添加结束时间
           PayState: this.searchData.payState, //交易状态
           F_IsExpress: -2, //-2全部 0客服未分配快递 1已分配
-          state: '',
+          state: "",
           F_AddProvince: this.provinceCityText && this.provinceCityText[0], // 省份
           F_AddCity: this.provinceCityText[1] && this.provinceCityText[1], // 市
           F_AddArea: this.provinceCityText[2] && this.provinceCityText[2], // 县区
@@ -350,54 +256,54 @@ export default {
           F_Express: this.searchData.express, //快递
           F_Status: this.searchData.logisticsStatus, //物流状态
           Warehousing: this.searchData.warehousing, //是否入库
-          startWaybill: this.waybillTime[0] == null ? '' : this.waybillTime[0],
-          endWaybill: this.waybillTime[1] == null ? '' : this.waybillTime[1],
-        };
-        getOrderListCustomerService(params).then(response => {
-          this.loading = false;
+          startWaybill: this.waybillTime && this.waybillTime[0],
+          endWaybill: this.waybillTime && this.waybillTime[1],
+        }
+        getOrderListCustomerService(params).then((response) => {
+          this.loading = false
           if (response.state.toLowerCase() === "success") {
-            this.pageParams.total = response.data.Totals;
-            this.dataLists = response.data.Rows;
+            this.pageParams.total = response.data.Totals
+            this.dataLists = response.data.Rows
           }
-        });
-        resolve();
-      });
+        })
+        resolve()
+      })
     },
     //处理默认选中当前日期
     getNowTime() {
-      let now = new Date();
-      let year = now.getFullYear(); //得到年份
-      let month = now.getMonth() + 1; //得到月份
-      let date = now.getDate(); //得到日期
-      let hour =" 00:00:00"; //默认时分秒 如果传给后台的格式为年月日时分秒，就需要加这个，如若不需要，此行可忽略
-      month = month.toString().padStart(2, "0");
-      date = date.toString().padStart(2, "0");
-      let defaultDate = `${year}-${month}-${date}`;
+      let now = new Date()
+      let year = now.getFullYear() //得到年份
+      let month = now.getMonth() + 1 //得到月份
+      let date = now.getDate() //得到日期
+      let hour = " 00:00:00" //默认时分秒 如果传给后台的格式为年月日时分秒，就需要加这个，如若不需要，此行可忽略
+      month = month.toString().padStart(2, "0")
+      date = date.toString().padStart(2, "0")
+      let defaultDate = `${year}-${month}-${date}`
       this.searchTime = [defaultDate, defaultDate]
     },
     // 获取订单类型
-    getOrderType () {
-      return new Promise(resolve => {
+    getOrderType() {
+      return new Promise((resolve) => {
         const params = {
           isleaf: true,
-          code: 'ORDERTYPE'
+          code: "ORDERTYPE",
         }
-        getDictionaryValueList(params).then(response => {
-          if (response.state.toLowerCase() === 'success') {
+        getDictionaryValueList(params).then((response) => {
+          if (response.state.toLowerCase() === "success") {
             this.orderType = response.data.Rows
           }
         })
       })
     },
     // 物流状态
-    getLogistics () {
-      return new Promise(resolve => {
+    getLogistics() {
+      return new Promise((resolve) => {
         const params = {
           isleaf: true,
-          code: 'OrderF_State'
+          code: "OrderF_State",
         }
-        getDictionaryValueList(params).then(response => {
-          if (response.state.toLowerCase() === 'success') {
+        getDictionaryValueList(params).then((response) => {
+          if (response.state.toLowerCase() === "success") {
             const res = response.data.Rows
             res.forEach((e, i) => {
               if (e.F_Remark === "未签收") {
@@ -415,14 +321,14 @@ export default {
       })
     },
     // 快递
-    getExpress () {
-      return new Promise(resolve => {
+    getExpress() {
+      return new Promise((resolve) => {
         const params = {
           isleaf: true,
-          code: 'EXPRESS'
+          code: "EXPRESS",
         }
-        getDictionaryValueList(params).then(response => {
-          if (response.state.toLowerCase() === 'success') {
+        getDictionaryValueList(params).then((response) => {
+          if (response.state.toLowerCase() === "success") {
             this.expressList = response.data.Rows
           }
         })
@@ -433,120 +339,119 @@ export default {
       return new Promise((resolve) => {
         const params = {
           isleaf: true,
-          code: 'DELIVERYDES'
+          code: "DELIVERYDES",
         }
         getDictionaryValueList(params).then((response) => {
-          if (response.state.toLowerCase() === 'success') {
+          if (response.state.toLowerCase() === "success") {
             this.addDesList = response.data.Rows
           }
         })
       })
     },
-    handleTabClick (tab, event) {
-      this.pageParams.pageindex=1
+    handleTabClick(tab, event) {
+      this.pageParams.pageindex = 1
       if (this.activeName == "6") {
         this.searchData.F_State = this.activeName
-        this.searchData.warehousing = ''
+        this.searchData.warehousing = ""
       } else if (this.activeName == "warehousing") {
-        this.searchData.F_State = 
-        this.searchData.warehousing = "1"
+        this.searchData.F_State = this.searchData.warehousing = "1"
       }
-      this.getList();
+      this.getList()
     },
-    btn_search () {
-      this.pageParams.pageindex = 1;
-      this.getList();
+    btn_search() {
+      this.pageParams.pageindex = 1
+      this.getList()
     },
     // 批量退回
-    btn_bulk_goback () {
+    btn_bulk_goback() {
       if (this.selectOrderId.length < 1) {
         this.$message({
           message: "请选择订单！",
           type: "warning",
-        });
-        return;
+        })
+        return
       }
-      let orderids = this.selectOrderId.join(',').replace(/\s+/g, '')
+      let orderids = this.selectOrderId.join(",").replace(/\s+/g, "")
       this.$layer.iframe({
         content: {
           content: goback, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: orderids } // props
+          data: { rowid: orderids }, // props
         },
         area: ["30%", "30%"],
-        title: "退回订单"
-      });
+        title: "退回订单",
+      })
     },
     //退回订单
-    btn_goback (orderid) {
+    btn_goback(orderid) {
       this.$layer.iframe({
         content: {
           content: goback, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: orderid } // props
+          data: { rowid: orderid }, // props
         },
         area: ["30%", "30%"],
-        title: "退回订单"
-      });
+        title: "退回订单",
+      })
     },
     // 快递信息
-    btn_bulk_express () {
+    btn_bulk_express() {
       if (this.selectOrderId.length < 1) {
         this.$message({
           message: "请选择订单！",
           type: "warning",
-        });
-        return;
+        })
+        return
       }
-      let orderids = this.selectOrderId.join(',').replace(/\s+/g, '')
+      let orderids = this.selectOrderId.join(",").replace(/\s+/g, "")
       this.$layer.iframe({
         content: {
           content: express, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: orderids } // props
+          data: { rowid: orderids }, // props
         },
         area: ["30%", "30%"],
-        title: "快递信息"
-      });
+        title: "快递信息",
+      })
     },
     // 快递信息
-    btn_express (orderid) {
+    btn_express(orderid) {
       this.$layer.iframe({
         content: {
           content: express, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: orderid } // props
+          data: { rowid: orderid }, // props
         },
         area: ["30%", "30%"],
-        title: "快递信息"
-      });
+        title: "快递信息",
+      })
     },
     // 导入快递信息
-    btn_import_express () {
+    btn_import_express() {
       this.$layer.iframe({
         content: {
           content: importExpress, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: '' } // props
+          data: { rowid: "" }, // props
         },
         area: ["30%", "30%"],
-        title: "导入快递信息"
-      });
+        title: "导入快递信息",
+      })
     },
     //订单详情
-    hadndleOrderCode (ordercode) {
+    hadndleOrderCode(ordercode) {
       this.$layer.iframe({
         content: {
           content: detail, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { 'rowid': ordercode }// props
+          data: { rowid: ordercode }, // props
         },
-        area: ['80%', '90%'],
-        title: '订单详情'
+        area: ["80%", "90%"],
+        title: "订单详情",
       })
     },
     //选择多个
-    handleSelectionChange (val) {
+    handleSelectionChange(val) {
       const ids = []
       this.multipleSelection = val
       for (let i = 0; i < this.multipleSelection.length; i++) {
@@ -562,19 +467,15 @@ export default {
         .catch((err) => {})
     },
     handleItemChange(val) {
-      this.provinceCityText = this.$refs['myCascader'].currentLabels
+      this.provinceCityText = this.$refs["myCascader"].currentLabels
       const pid = val ? val[val.length - 1] : 1 // id值
       this.level = val.length + 1 // 判断第几级
-      this.provinceCityDatas = this.handleData(
-        this.provinceCityDatas,
-        pid,
-        this.level
-      )
+      this.provinceCityDatas = this.handleData(this.provinceCityDatas, pid, this.level)
     },
     handleData(data, val, level) {
       for (let i = 0; i < data.length; i++) {
         if (!data[i].children) {
-          this.$set(data[i], 'children', [])
+          this.$set(data[i], "children", [])
         }
         if (data[i].id === val) {
           getProviceCityById({ pid: val })
@@ -583,7 +484,7 @@ export default {
                 data[i].children = res.data
                 if (this.level !== 4) {
                   data[i].children.forEach((ele) => {
-                    this.$set(ele, 'children', [])
+                    this.$set(ele, "children", [])
                   })
                 }
               } else {
@@ -599,12 +500,26 @@ export default {
       }
       return data
     },
-  }
-};
+  },
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+.filter-container {
+  .el-select {
+    margin-right: 10px;
+  }
+  .el-date-editor {
+    margin-right: 10px;
+  }
+  .el-cascader {
+    margin-right: 10px;
+  }
+  .filter-item {
+    vertical-align: top;
+  }
+}
 .el {
   cursor: pointer;
 }
-</style>
+</style>

CallCenterWeb.UI/src/views/memberManagement/memberList/components/addOrder.vue

@@ -48,7 +48,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="商品" prop="productName">
-                <el-select v-model="commoditySearchData.productName" class="form_select" value-key="F_ProductId" clearable placeholder="请选择商品" @change="commodityListChange">
+                <el-select v-model="commoditySearchData.productName" class="form_select" value-key="F_ProductId" clearable placeholder="请选择商品" filterable @change="commodityListChange">
                   <el-option v-for="item in commodityListLists" :key="item.F_ProductId" :label="item.F_ProductName" :value="item" />
                 </el-select>
               </el-form-item>
@@ -293,9 +293,9 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-form-item label="会员备注" prop="F_MemberNotes">
+          <!-- <el-form-item label="会员备注" prop="F_MemberNotes">
             <el-input :autosize="{ minRows: 4 }" v-model="ruleForm.F_MemberNotes" type="textarea" placeholder="请输入会员备注" />
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="备注" prop="F_Remark">
             <el-input :autosize="{ minRows: 4 }" v-model="ruleForm.F_Remark" type="textarea" placeholder="请输入备注" />
           </el-form-item>
@@ -461,7 +461,7 @@ export default {
         F_Belong: 0, // 否 number 归属人id
         F_BelongName: "", // 否 string 归属人名称,
         F_VipId: "", // 关联会员id
-        F_MemberNotes: "", // 会员备注
+        // F_MemberNotes: "", // 会员备注
         F_IsPayment: 0, // 是否提前付款
         F_RecommenderTel: "", // 推荐人手机号
         F_MediaName: "", // 媒体名称

CallCenterWeb.UI/src/views/memberManagement/memberList/components/afterSale.vue

@@ -428,6 +428,6 @@ export default {
   width: 100%;
 }
 .form_input_number {
-  width: 100%; 
+  width: 100%;
 }
 </style>

CallCenterWeb.UI/src/views/memberManagement/memberList/components/importFile.vue

@@ -18,6 +18,7 @@
           :on-success="uploadSuccess"
           :on-error="uploadError"
           :on-exceed="uploadExceed"
+          :before-upload="beforeUpload"
           :auto-upload="false"
           class="uploadFiles"
           list-type="text"
@@ -73,7 +74,6 @@ export default {
   },
   methods: {
     submitUpload() {
-      this.loading = true
       this.$refs.upload.submit()
     },
     // 文件上传
@@ -87,6 +87,9 @@ export default {
       }
       this.loading = false
     },
+    beforeUpload(file) {
+      this.loading = true
+    },
     uploadExceed(file, fileList) {
       this.$message.warning('只能选择一个文件!')
     },

CallCenterWeb.UI/src/views/memberManagement/memberList/index.vue

@@ -43,6 +43,8 @@
       </el-table-column>
       <el-table-column prop="F_Count" label="购买次数" align="center" width="" />
       <el-table-column prop="F_CreateOn" label="建档日期" align="center" width="" />
+      <el-table-column prop="DeptName" label="部门" align="center" width="" />
+      <el-table-column prop="CoreName" label="中心" align="center" width="" />
       <el-table-column label="操作" width="180" align="center" class-name="oparate_btn" fixed="right">
         <template slot-scope="scope">
           <el-button v-permission="'HY_add_order'" type="text" @click="btn_add_order(scope.row.F_ID)">添加订单</el-button>

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

@@ -388,6 +388,6 @@ export default {
   width: 100%;
 }
 .form_input_number {
-  width: 100%; 
+  width: 100%;
 }
 </style>

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

@@ -428,6 +428,6 @@ export default {
   width: 100%;
 }
 .form_input_number {
-  width: 100%; 
+  width: 100%;
 }
 </style>

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

@@ -42,7 +42,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="商品" prop="productName">
-            <el-select v-model="commoditySearchData.productName" class="filter-item" value-key="F_ProductId" clearable placeholder="请选择商品" @change="commodityListChange">
+            <el-select v-model="commoditySearchData.productName" class="filter-item" value-key="F_ProductId" clearable filterable placeholder="请选择商品" @change="commodityListChange">
               <el-option v-for="item in commodityListLists" :key="item.F_ProductId" :label="item.F_ProductName" :value="item"> </el-option>
             </el-select>
           </el-form-item>
@@ -258,9 +258,9 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-form-item label="会员备注" prop="F_MemberNotes">
+      <!-- <el-form-item label="会员备注" prop="F_MemberNotes">
         <el-input :autosize="{ minRows: 4 }" v-model="ruleForm.F_MemberNotes" type="textarea" placeholder="请输入会员备注" />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="备注" prop="F_Remark">
         <el-input :autosize="{ minRows: 4 }" v-model="ruleForm.F_Remark" type="textarea" placeholder="请输入备注" />
       </el-form-item>
@@ -430,7 +430,7 @@ export default {
         F_Belong: 0, //否 number 归属人id
         F_BelongName: "", //否 string 归属人名称
         F_Remark: "", //否 string 备注
-        F_MemberNotes: "", // 会员备注
+        // F_MemberNotes: "", // 会员备注
         F_VipId: "", // 关联会员id
         F_MediaName: "", // 媒体名称
         F_Media: 0, // 媒体
@@ -1064,7 +1064,7 @@ export default {
         this.ruleForm.F_Belong = res.F_Belong //归属人id
         this.ruleForm.F_BelongName = res.F_BelongName //归属人名称
         this.ruleForm.F_Remark = res.F_Remark //备注
-        this.ruleForm.F_MemberNotes = res.F_MemberNotes //会员备注
+        // this.ruleForm.F_MemberNotes = res.F_MemberNotes //会员备注
         this.totalAmount = res.F_TotlePrice // 应付金额
         this.ruleForm.F_VipId = res.F_VipId // 会员id
         this.ruleForm.F_Media = res.F_Media // 媒体id