Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/api/ecw/warehouse.js

@@ -9,6 +9,16 @@ export function createWarehouse(data) {
   })
 }
 
+//创建提单模板
+export function createTemplate(data) {
+  console.log(data);
+  return request({
+    url: '/ecw/lading-template/create',
+    method: 'post',
+    data: data
+  })
+}
+
 // 更新仓库
 export function updateWarehouse(data) {
   return request({
@@ -80,6 +90,14 @@ export function changeRouteStatus(data) {
   })
 }
 
+export function getLadingTemplate(data) {
+  console.log(data);
+  return request({
+    url: '/ecw/lading-template/getByLineId?lineId='+data,
+    method: 'get'
+  })
+}
+
 /**查看已开通线路列表 */
 export function openedRouterList(data = {}) {
   return request({

src/api/member/user.js

 import request from '@/utils/request'
+import query from "@/views/ecw/customer/query";
 
 // 创建用户
 export function createUser(data) {
@@ -77,3 +78,43 @@ export function memberGetAuthIdcardInfo(query){
     params:query,
   })
 }
+//获取指定企业认证信息
+export function memberGetAuthEnterpriseInfo(query){
+  return request({
+    url:'/member/user/get-auth-enterprise-info',
+    method:'get',
+    params:query,
+  })
+}
+//身份证审核
+ export function memberUserAuditIdCard(query){
+  return request({
+    url:'/member/user/audit-idcard',
+     method :'get',
+     params:query,
+  })
+ }
+//企业认证审核
+export function memberUserAuditEnterprise(query){
+   return request({
+     url:'/member/user/audit-enterprise',
+     method:'get',
+     params:query,
+   })
+}
+//修改身份证
+ export function memberUserUpdateIdCard(data){
+  return request({
+    url:'/member/user/update-idcard',
+    method:'put',
+    data: data
+  })
+ }
+// 修改企业
+ export function  memberUserUpdateEnterprise(data){
+   return request({
+     url:'/member/user/update-enterprise',
+     method:'put',
+     data:data,
+   })
+}

src/api/system/internalMessage.js

@@ -61,3 +61,14 @@ export function getMyInternalMessagePage(query) {
     params: query
   })
 }
+
+//获取个未读消息
+export  function getNotReadInternalMessageTotal(){
+  return request(
+    {
+      url:'ecw/internal-message/getNotReadInternalMessageTotal',
+      method:'get',
+
+    }
+  )
+}

src/layout/components/Navbar.vue

@@ -8,8 +8,8 @@
     <div class="right-menu">
       <template v-if="device!=='mobile'">
 
-        <el-badge :value="notReadTotal" class="right-menu-item badge">
-         <el-image style="width: 22px;height: 20px;" :src="unreadMessage"></el-image>
+        <el-badge :value="notMessage" class="right-menu-item badge">
+         <el-image style="width: 22px;height: 20px;cursor: pointer;" :src="unreadMessage" @click="notRead"></el-image>
         </el-badge>
 
 
@@ -79,6 +79,9 @@ export default {
       notReadTotal:0,//要去取VUEX里面的未读数据总数，我不会,登录之后要调得到当前人未读记录总数接口放到VUEX中
     }
   },
+  created() {
+   this.$store.dispatch('getNotMessage');
+    },
   components: {
     Breadcrumb,
     TopNav,
@@ -110,6 +113,9 @@ export default {
       get() {
         return this.$store.state.settings.topNav
       }
+    },
+    notMessage(){
+      return this.$store.state.user.notMessage
     }
   },
   methods: {
@@ -128,7 +134,7 @@ export default {
       }).catch(() => {});
     },
     notRead(){
-      this.$router.push({path:'/system/internalMessage/my-internal-message',query:{'status':0}});
+      this.$router.push({path:'/system/internalMessage/my-internal-message',query:{status:'0'}});
     }
   }
 }
@@ -182,6 +188,7 @@ export default {
      .el-badge__content{
        top: 13px;
        right:15px;
+       height: 20px;
      }
     }
     .right-menu-item {

src/store/modules/user.js

 import {login, logout, getInfo, socialLogin, socialLogin2} from '@/api/login'
 import { getToken, setToken, removeToken } from '@/utils/auth'
+import {getNotReadInternalMessageTotal} from '@/api/system/internalMessage'
 
 const user = {
   state: {
@@ -8,7 +9,8 @@ const user = {
     name: '',
     avatar: '',
     roles: [],
-    permissions: []
+    permissions: [],
+    notMessage:0,
   },
 
   mutations: {
@@ -29,6 +31,9 @@ const user = {
     },
     SET_PERMISSIONS: (state, permissions) => {
       state.permissions = permissions
+    },
+    NOt_MESSAGE:(state, notMessage)=>{
+      state.notMessage = notMessage;
     }
   },
 
@@ -146,7 +151,18 @@ const user = {
         removeToken()
         resolve()
       })
-    }
+    },
+  //  获取未登录消息
+    getNotMessage({commit}){
+      return new Promise((resolve, reject) =>{
+        getNotReadInternalMessageTotal().then((r)=>{
+          commit('NOt_MESSAGE',r.data);
+          resolve()
+        }).catch(error =>{
+          reject(error);
+        })
+      })
+    },
   }
 }
 

src/views/ecw/customer/index.vue

@@ -677,7 +677,9 @@ export default {
     },
     followUp(row){
       this.customerId = row.id;
+     this.$nextTick(()=>{
        this.$refs.CustomerFollowList.customerFollow.dialogVisible = true;
+     })
     },
     complaint(row){
       this.customerId = row.id;

src/views/ecw/warehouse/index.vue

@@ -30,6 +30,10 @@
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
                    v-hasPermi="['ecw:warehouse:export']">导出</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="templateClick('')"
+                   v-hasPermi="['ecw:warehouse:create']">批量设置提单模板</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -108,6 +112,8 @@
           <template slot-scope="scope">
             <el-button size="mini" type="text" @click="routeStatusClick(scope.row)"
                       v-hasPermi="['ecw:warehouse:routerQuery']">{{scope.row.lineId ? '关闭线路' : '开通线路'}}</el-button>
+            <el-button size="mini" type="primary" @click="templateClick(scope.row)" v-if="scope.row.lineId != null"
+                       v-hasPermi="['ecw:warehouse:routerQuery']">设置路线提单模板</el-button>
           </template>
         </el-table-column>
      </el-table>
@@ -245,11 +251,81 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!-- 对话框(添加 / 修改) -->
+    <el-dialog title="设置路线提单模板" :visible.sync="templateOpen" width="1000px" @close="ladingFormClose()" append-to-body>
+      <el-form ref="form" :model="ladingform" :rules="rules" label-width="80px">
+        <el-form-item label="货柜前缀" prop="prefixCounter">
+          <el-input v-model="ladingform.prefixCounter" placeholder="请输入货柜前缀" />
+        </el-form-item>
+        <el-form-item label="抬头" prop="titleZh">
+          <editor v-model="ladingform.titleZh" :min-height="192"/>
+        </el-form-item>
+
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span>账户详情</span>
+            <el-button style="float: right;" size="small" type="primary" @click="handleAddAccount">添加账户+</el-button>
+          </div>
+          <el-table
+            :data="arr"
+            style="width: 100%"
+          >
+            <el-table-column
+              prop="detail"
+              label="详情"
+              width=""
+            >
+              <template v-slot="{ row, column, $index }">
+                <el-input v-model="row.detail" placeholder="请输入详情" size="mini"/>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="name"
+              label="名称"
+              width=""
+            >
+              <template v-slot="{row}">
+                <el-input v-model="row.name" placeholder="请输入名称" size="mini"/>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="company"
+              label="公司"
+            >
+              <template v-slot="{row}">
+                <el-input v-model="row.company" placeholder="请输入公司" size="mini"/>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="operate"
+              label="操作"
+            >
+              <template slot-scope="scope">
+                <el-button type="danger" @click="delRow(scope.$index)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
+
+        <el-form-item label="条款" prop="contentZh">
+          <editor v-model="ladingform.contentZh" :min-height="192"/>
+        </el-form-item>
+
+        <el-form-item v-if="showFlag">
+          <routers-selector v-model="ladingform.lineIds" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitTemplateForm">保 存</el-button>
+        <el-button @click="resetTemplate()">重 置</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { createWarehouse, updateWarehouse, deleteWarehouse, getWarehouse, getWarehousePage,
+import { createWarehouse, updateWarehouse, deleteWarehouse, getWarehouse, getWarehousePage,createTemplate,getLadingTemplate,
 exportWarehouseExcel,routerList,changeRouteStatus,deptBind,deptList } from "@/api/ecw/warehouse";
 import { getNodePage } from "@/api/ecw/node";
 import { getListTree } from "@/api/ecw/region";
@@ -257,11 +333,18 @@ import { getDictDatas, DICT_TYPE } from '@/utils/dict'
 import {CommonStatusEnum} from '@/utils/constants'
 import { uploadFile } from "@/api/infra/file";
 import { listDept } from "@/api/system/dept";
+import Editor from '@/components/Editor';
+import {getDictData} from '@/utils/dict'
+import RoutersSelector from '@/components/RoutersSelector';
 import { has } from 'min-dash';
+import Template from "../../cms/template/index";
 
 export default {
   name: "Warehouse",
   components: {
+      Template,
+      Editor,
+      RoutersSelector
   },
   data() {
 
@@ -315,6 +398,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      templateOpen:false,
       dateRangeCreateTime: [],
 
       isUpdate: false,
@@ -331,7 +415,9 @@ export default {
         id: null,
         tradeType: null
       },
-
+        showFlag:false,
+      arr:[],
+        cols:[{prop:"detail",label:"详情"},{prop:"name",label:"名称"},{prop:"company",label:"公司"},{prop:"operate",label:"操作"}],
       // 查询参数
       queryParams: {
         pageNo: 1,
@@ -356,6 +442,7 @@ export default {
       },
       // 表单参数
       form: {checkList:[],},
+      ladingform: {prefixCounter:null,titleZh:null,contentZh:null,account:null,acctArr:[]},
       // 表单校验
       rules: {
         nodeId: [{ required: true, message: "服务网点不能为空", trigger: "blur" }],
@@ -446,6 +533,18 @@ export default {
       });
     },
 
+      delRow(index){
+          this.arr.splice(index, 1);
+      },
+      ladingFormClose(){
+          this.resetTemplate();
+      },
+    handleAddAccount(){
+        const obj = {"detail": "",
+            "name": "",
+            "company": ""};
+        this.arr.push(obj)
+    },
     /** 查询部门列表 */
     getDeptList() {
       listDept(this.queryParams).then(response => {
@@ -556,6 +655,25 @@ export default {
       });
     },
 
+      templateClick(row) {
+        if(row!=''){
+          getLadingTemplate(row.lineId).then(response => {
+              if(response.data!=null){
+                  this.ladingform = response.data;
+                  var jsonArr = JSON.parse(response.data.account);
+                  for (var i in jsonArr) {
+                      this.arr.push(jsonArr[i]);
+
+                  }
+              }
+          });
+            this.ladingform.lineId = row.lineId;
+        }else {
+            this.showFlag = true;
+        }
+          this.templateOpen = true;
+      },
+
     routeStatusClick(row) {
       this.routeQueryParam.transportType = row.transportType;
       this.routeQueryParam.warehouseId = row.id;
@@ -650,6 +768,16 @@ export default {
       this.open = false;
       this.reset();
     },
+    resetTemplate(){
+        this.arr=[];
+        this.showFlag = false;
+        this.ladingform={
+            prefixCounter:undefined,
+            titleZh:undefined,
+            account:undefined,
+            contentZh:undefined
+        }
+    },
     /** 表单重置 */
     reset() {
       this.form = {
@@ -766,6 +894,23 @@ export default {
         });
       });
     },
+
+      submitTemplateForm(){
+        if(this.showFlag&&this.ladingform.lineIds!=null){
+            let lineId = '';
+            let lineArr = this.ladingform.lineIds;
+            lineArr.forEach((elem, index) => {
+                lineId = lineId + elem.lineId + ",";
+            });
+            this.ladingform.lineId=lineId.substr(0,lineId.length-1);
+        }
+        this.ladingform.account = JSON.stringify(this.arr);
+          createTemplate(this.ladingform).then(response => {
+              this.$modal.msgSuccess("设置路线提单模板成功");
+              this.templateOpen = false;
+              this.resetTemplate();
+          });
+      },
     /** 删除按钮操作 */
     handleDelete(row) {
       const id = row.id;