Merge branch 'dev' of http://git.echepei.com/tubao/Smart_platform_ui into dev

src/router/axios.js

@@ -79,6 +79,9 @@ axios.interceptors.response.use(res => {
   if (statusWhiteList.includes(status)) return Promise.reject(res);
   //如果是401则跳转到登录页面
   if (status === 401) store.dispatch('FedLogOut').then(() => router.push({ path: '/login' }));
+  if (status === 601) {
+      return res
+  }
   // 如果请求为非200否者默认统一处理
   if (status !== 200) {
     Message({

src/views/authority/role.vue

@@ -371,7 +371,18 @@
       onLoad(page, params = {}) {
         this.loading = true;
         getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          this.data = res.data.data;
+            let data = res.data.data;
+            data.sort((a, b)=>{
+                return a.sort>b.sort ? 1 : (a.sort<b.sort ? -1 : 0)
+            })
+            data.forEach(d=>{
+                if(Array.isArray(d.children)){
+                    d.children.sort((a, b)=>{
+                        return a.sort>b.sort ? 1 : (a.sort<b.sort ? -1 : 0)
+                    })
+                }
+            })
+          this.data = data;
           this.loading = false;
           this.selectionClear();
         });

src/views/iosBasicData/OceanFreightImport/bills/billsDetails.vue

@@ -963,7 +963,7 @@ export default {
         },
         // 获取业务来源业务员数据
         salesUserGetListfun(account) {
-            selectListLos('业务员').then(res => {
+            selectListLos('业务员', account).then(res => {
                 this.columnforfun('srcCnName').dicData = res.data.data
             })
         },
@@ -1051,7 +1051,7 @@ export default {
                     arr = list
                 }
                 this.$refs.bcorps[0].selectionList = arr
-            } 
+            }
         },
         /* 远程模糊查询操作用户 */
         remoteMethod(value, name) {

src/views/iosBasicData/SeafreightExportF/bills/approvalDetails.vue

@@ -31,7 +31,7 @@
 
         <div style="margin-top: 65px">
             <el-tabs type="border-card" v-model="bigtabs" @tab-click="bigHandleClick">
-                <el-tab-pane label="委托1信息" name="wt">
+                <el-tab-pane label="委托信息" name="wt">
                     <div>
                         <div>
                             <el-form :model="form" ref="form" label-width="90px" class="demo-ruleForm">

src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -408,7 +408,7 @@ export default {
                 cargoType: 'dry', // 货物类型默认普货
                 marks: 'N/M',
                 dgPackingLevel: '0', // 危险品包装等级
-                serviceTerms: 'CY to CY', // 服务方式
+                serviceTerms: 'CY-CY', // 服务方式
                 filesList: [], // 文件中心
                 feeCenterListD: [], // 收
                 feeCenterListC: [], // 付
@@ -448,7 +448,7 @@ export default {
                 cargoType: 'dry', // 货物类型默认普货
                 marks: 'N/M',
                 dgPackingLevel: '0', // 危险品包装等级
-                serviceTerms: 'CY to CY', // 服务方式
+                serviceTerms: 'CY-CY', // 服务方式
                 filesList: [], // 文件中心
                 feeCenterListD: [], // 收
                 feeCenterListC: [], // 付
@@ -1325,7 +1325,7 @@ export default {
                     this.columnforfun('srcCnName').dicData = res.data.data.records
                 })
             } else {
-                selectListLos('业务员').then(res => {
+                selectListLos('业务员', account).then(res => {
                     this.columnforfun('srcCnName').dicData = res.data.data
                 })
             }
@@ -2213,6 +2213,15 @@ export default {
             this.pageLoading = true
             billsSubmit(this.form).then(res => {
                 this.pageLoading = false
+                if (res.data.code === 601) {
+                    console.info('11111111111----', res)
+                    this.billsDetailfun(this.form.id)
+                    this.$message({
+                        type: "error",
+                        message: res.data.msg
+                    });
+                    return true
+                }
                 this.$message({
                     type: "success",
                     message: "操作成功!"

src/views/iosBasicData/financeProfit/index.vue

@@ -567,7 +567,7 @@ export default {
             if (this.query.srcType == 'SALES') {
                 // 业务员
                 this.srcforParameter = { key: 'id', label: 'name', value: 'id' }
-                this.salesUserGetListfun(value)
+                this.salesUserGetListfun(value, '业务员')
             } else if (this.form.srcType == 'AGENT') {
                 // 代理
                 this.srcforParameter = { key: 'id', label: 'cnName', value: 'id' }
@@ -592,7 +592,7 @@ export default {
                 } else if (value == 'SALES') {
                     // 业务员
                     this.srcforParameter = { key: 'id', label: 'name', value: 'id' }
-                    this.salesUserGetListfun()
+                    this.salesUserGetListfun('', '业务员')
                 } else { }
                 this.$set(this.query, name, value)
             } else if (name == 'accDeptName') {
@@ -652,8 +652,9 @@ export default {
             })
         },
         // 获取业务来源业务员数据
-        salesUserGetListfun(account) {
-            userGetList(1, 10, { account }).then(res => {
+        salesUserGetListfun(account, role) {
+            console.info('account-----', account)
+            userGetList(1, 10, { account: account, roleId: role }).then(res => {
                 this.srcIdData = res.data.data.records
             })
         },

src/views/iosBasicData/paymentDetail/index.vue

@@ -451,7 +451,7 @@ export default {
                     // 业务员
                     this.srcforParameter = { key: 'id', label: 'name', value: 'name' }
                     this.findObject(this.option.column, "srcId").label = '业务员'
-                    this.salesUserGetListfun()
+                    this.salesUserGetListfun('', '业务员')
                 } else { }
                 this.$set(this.query, name, value)
             } else if (name == 'srcName') {
@@ -479,7 +479,7 @@ export default {
             if (this.query.srcType == 'SALES') {
                 // 业务员
                 this.srcforParameter = { key: 'id', label: 'name', value: 'name' }
-                this.salesUserGetListfun(value)
+                this.salesUserGetListfun(value, '业务员')
             } else if (this.form.srcType == 'AGENT') {
                 // 代理
                 this.srcforParameter = { key: 'id', label: 'cnName', value: 'cnName' }
@@ -567,8 +567,8 @@ export default {
             })
         },
         // 获取业务来源业务员数据
-        salesUserGetListfun(account) {
-            userGetList(1, 10, { account }).then(res => {
+        salesUserGetListfun(account, role) {
+            userGetList(1, 10, { account: account, roleId: role }).then(res => {
                 this.srcIdData = res.data.data.records
             })
         },

src/views/tirePartsMall/pointsMall/pointsGoods/detailsPage.vue

@@ -250,7 +250,7 @@ export default {
                             label: 'cname',
                             value: 'id'
                         },
-                        dicUrl: '/api/blade-sales-part/corpsDesc/listAll?corpType=GYS&enableOrNot=1,'
+                        dicUrl: '/api/blade-sales-part/corpsDesc/listAll?corpType=GYS&enableOrNot=1'
                     },
                     {
                         label: "所属公司",