Merge remote-tracking branch 'origin/master'

package.json

@@ -1,7 +1,7 @@
 {
   "name": "fs",
   "version": "1.1.0",
-  "description": "御君方管理总后台",
+  "description": "润天智慧云医数字DTC客户服务管理系统",
   "author": "FS",
   "license": "MIT",
   "scripts": {

src/layout/components/Sidebar/Logo.vue

@@ -26,7 +26,7 @@ export default {
   },
   data() {
     return {
-      title: '御君方管理总后台',
+      title: '润天智慧云医',
       logo: logoImg
     }
   }

src/views/login.vue

@@ -1,8 +1,8 @@
 <template>
    <div class="login" id="loginBox">
     <div class="login-con">
-        <div class="title">御君方管理总后台</div>
-      <el-form   ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
+        <div class="title">润天智慧云医数字DTC客户服务管理系统</div>
+        <el-form   ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
       
         <el-form-item prop="username">
           <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">

src/views/oms/store/index.vue

@@ -153,7 +153,7 @@
 
        <el-table-column  label="状态" align="center" prop="status">
         <template slot-scope="scope">
-            <el-tag prop="status"  v-for="(item, index) in statusOptions"   v-if="scope.row.status==item.dictValue">{{item.dictLabel}}</el-tag>
+            <el-tag prop="status"  v-for="(item, index) in statusOptions"   :type="scope.row.status==0?'danger':'success'" v-if="scope.row.status==item.dictValue">{{item.dictLabel}}</el-tag>
         </template>
       </el-table-column>
 
@@ -436,6 +436,7 @@ export default {
       const storeId = row.storeId || this.ids
       getStore(storeId).then(response => {
         this.form = response.data;
+        this.form.channelWarehouseName=row.channelWarehouseName;
         if(this.form.channelType!=null){
             this.form.channelType = this.form.channelType.toString();
         }

src/views/store/storeAfterSales/index.vue

@@ -13,7 +13,6 @@
       </el-form-item>
       <el-form-item label="订单单号" prop="orderCode">
         <el-input
-          
           v-model="queryParams.orderCode"
           placeholder="请输入订单单号"
           clearable
@@ -23,7 +22,6 @@
       </el-form-item>
       <el-form-item label="员工姓名" prop="companyUserNickName">
         <el-input
-          
           v-model="queryParams.companyUserNickName"
           placeholder="请输入员工姓名"
           clearable
@@ -31,6 +29,20 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+
+    
+       <el-form-item label="退款类型" prop="serviceType">
+        <el-select  v-model="queryParams.serviceType" placeholder="请选择退款类型" clearable size="small" >
+         <el-option
+                v-for="item in serviceTypeOptions"
+                :key="item.dictValue"
+                :label="item.dictLabel"
+                :value="item.dictValue"
+              />
+        </el-select>
+      </el-form-item>
+
+
       <el-form-item label="状态" prop="status">
         <el-select  v-model="queryParams.status" placeholder="请选择状态" clearable size="small" >
          <el-option
@@ -61,6 +73,7 @@
               />
         </el-select>
       </el-form-item>
+
       <el-form-item label="物流状态" prop="deliveryStatus">
          <el-select   v-model="queryParams.deliveryStatus" placeholder="请选择物流状态" clearable size="small" >
          <el-option
@@ -71,6 +84,17 @@
               />
         </el-select>
       </el-form-item>
+
+       <el-form-item label="物流单号" prop="deliverySn">
+          <el-input
+            v-model="queryParams.deliverySn"
+            placeholder="物流/退回物流单号"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"/>
+       </el-form-item>
+
+
       <el-form-item label="提交时间" prop="createTime">
         <el-date-picker
           style="width:205.4px"
@@ -135,7 +159,10 @@
               <el-tag prop="status" v-for="(item, index) in deliveryStatusOptions"    v-if="scope.row.deliveryStatus==item.dictValue">{{item.dictLabel}}</el-tag>
           </template>
       </el-table-column>
+
       <el-table-column label="物流单号" align="center" prop="deliveryId" />
+
+      <el-table-column label="客户退回物流单号" align="center" prop="deliverySn" />
     
       <el-table-column label="提交时间" align="center" prop="createTime" />
     

vue.config.js

@@ -13,7 +13,7 @@ function resolve(dir) {
   return path.join(__dirname, dir)
 }
 
-const name = defaultSettings.title || '御君方管理总后台' // 标题
+const name = defaultSettings.title || '润天智慧云医' // 标题
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口