Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/cheliangyudingEdit.vue

@@ -4,8 +4,8 @@
       <div class="tab-header webtop">
         <div>{{ viewTitle }}</div>
         <div>
-          <el-button type="primary" size="small" :disabled="FormLoading" @click="handleCreate()">保存</el-button>
-          <el-button type="primary" size="small" :disabled="disabled" @click="handleSubmit()">提交</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="handleCreate()">保存</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="handleSubmit()">提交</el-button>
         </div>
       </div>
       <div class="">
@@ -81,7 +81,7 @@
             <el-table-column align="center" label="序号" type="index" width="60"/>
             <el-table-column label="操作" align="center" width="80px" class-name="small-padding fixed-width">
               <template slot-scope="scope">
-                <el-button size="mini" type="danger" @click="handleDelete(scope.row,scope.$index)">删除
+                <el-button size="mini" type="danger" @click="handleDelete(scope.$index)">删除
                 </el-button>
               </template>
             </el-table-column>
@@ -257,10 +257,8 @@ export default {
           this.temp.staffSid = window.sessionStorage.getItem('staffSid')
           this.temp.orgSid = window.sessionStorage.getItem('orgSid')
           saveChe(this.temp).then((response) => {
-            this.FormLoading = true
-            if (response.code === '200') {
-              this.FormLoading = false
-              this.$message({ showClose: true, type: 'success', message: '提交成功' })
+            if (response.success) {
+              this.$message({ showClose: true, type: 'success', message: '保存成功' })
               // 子页面向父级页面传递值
               window.parent.postMessage({
                 cmd: 'returnHeight',
@@ -269,6 +267,8 @@ export default {
                   code: 1
                 }
               }, '*')
+            } else {
+              this.submitdisabled = false
             }
           })
         }
@@ -301,13 +301,8 @@ export default {
             console.log('提交时sid', this.temp.sid)
             // 提交流程
             submitVehicleApprove(this.temp).then((response) => {
-              if (response.code === '200') {
-                this.$notify({
-                  title: '提示',
-                  message: '提交成功',
-                  type: 'success',
-                  duration: 2000
-                })
+              if (response.success) {
+                this.$message({ showClose: true, type: 'success', message: '提交成功' })
                 // 子页面向父级页面传递值
                 window.parent.postMessage({
                   cmd: 'returnHeight',
@@ -316,6 +311,8 @@ export default {
                     code: 1
                   }
                 }, '*')
+              } else {
+                this.submitdisabled = false
               }
             })
           }
@@ -349,7 +346,7 @@ export default {
       }
     },
     // 删除一行
-    handleDelete(row, index) {
+    handleDelete(index) {
       this.temp.carList.splice(index, 1)
     },
     // ------------ 页面跳转以及数据获取 ------------

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquEdit.vue

@@ -447,7 +447,7 @@ export default {
           this.temp.userSid = window.sessionStorage.getItem('userSid')
           saveDing(this.temp).then((response) => {
             if (response.success) {
-              this.$message({ showClose: true, type: 'success', message: '修改成功' })
+              this.$message({ showClose: true, type: 'success', message: '保存成功' })
               // 子页面向父级页面传递值
               window.parent.postMessage({
                 cmd: 'returnHeight',
@@ -456,6 +456,8 @@ export default {
                   code: 1
                 }
               }, '*')
+            } else {
+              this.submitdisabled = false
             }
           })
         }
@@ -496,11 +498,7 @@ export default {
                     }
                   }, '*')
                 } else {
-                  this.$notify({
-                    title: '提交失败',
-                    message: response.msg,
-                    type: 'error'
-                  })
+                  this.submitdisabled = false
                 }
               })
             }

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/relation/xuanzecheliang.vue

@@ -154,10 +154,8 @@ export default {
       } else {
         this.listQuery.params.vinNoList = []
       }
-      this.listQuery.current = 1
-      this.listQuery.total = 0
-      this.listQuery.size = 5
       this.getcarbrand()
+      this.handleReset()
     },
     // 搜索条件效果
     clicksearchShow() {
@@ -213,7 +211,6 @@ export default {
           })
         }
       })
-      this.getList()
     },
     // 确认
     handleConfirm() {

anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/com/xuanzecheliang.vue

@@ -154,10 +154,8 @@ export default {
       } else {
         this.listQuery.params.vinNoList = []
       }
-      this.listQuery.current = 1
-      this.listQuery.total = 0
-      this.listQuery.size = 5
       this.getcarbrand()
+      this.handleReset()
     },
     // 搜索条件效果
     clicksearchShow() {
@@ -213,7 +211,6 @@ export default {
           })
         }
       })
-      this.getList()
     },
     // 确认
     handleConfirm() {

anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingdanAdd.vue

@@ -82,7 +82,7 @@
             <el-table-column align="center" label="序号" type="index" width="60"/>
             <el-table-column label="操作" align="center" width="80px" class-name="small-padding fixed-width">
               <template slot-scope="scope">
-                <el-button size="mini" type="danger" @click="handleDelete(scope.row,scope.$index)">删除
+                <el-button size="mini" type="danger" @click="handleDelete(scope.$index)">删除
                 </el-button>
               </template>
             </el-table-column>
@@ -260,15 +260,11 @@ export default {
           this.temp.staffSid = window.sessionStorage.getItem('staffSid')
           this.temp.orgSid = window.sessionStorage.getItem('orgSid')
           saveChe(this.temp).then((response) => {
-            if (response.code === '200') {
+            if (response.success) {
+              this.$message({ showClose: true, type: 'success', message: '保存成功' })
               this.handleReturn('true')
             } else {
-              this.$notify({
-                title: '提示',
-                message: '添加失败',
-                type: 'error',
-                duration: 2000
-              })
+              this.submitdisabled = false
             }
           })
         }
@@ -305,20 +301,11 @@ export default {
             console.log('提交时sid', this.temp.sid)
             // 提交流程
             submitVehicleApprove(this.temp).then((response) => {
-              if (response.code === '200') {
-                this.$notify({
-                  title: '提示',
-                  message: '提交成功',
-                  type: 'success',
-                  duration: 2000
-                })
+              if (response.success) {
+                this.$message({ showClose: true, type: 'success', message: '提交成功' })
                 this.handleReturn('true')
               } else {
-                this.$notify({
-                  title: '提交失败',
-                  message: response.msg,
-                  type: 'error'
-                })
+                this.submitdisabled = false
               }
             })
           }

anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjinAdd.vue

@@ -449,15 +449,11 @@ export default {
           this.temp.orgSid = window.sessionStorage.getItem('orgSid')
           this.temp.userSid = window.sessionStorage.getItem('userSid')
           saveDing(this.temp).then((response) => {
-            if (response.code === '200') {
+            if (response.success) {
+              this.$message({ showClose: true, type: 'success', message: '保存成功' })
               this.handleReturn('true')
             } else {
-              this.$notify({
-                title: '提示',
-                message: '添加失败',
-                type: 'error',
-                duration: 2000
-              })
+              this.submitdisabled = false
             }
           })
         }
@@ -487,14 +483,11 @@ export default {
               this.temp.userSid = window.sessionStorage.getItem('userSid')
               // 提交流程
               submitApprove(this.temp).then((response) => {
-                if (response.code === '200') {
+                if (response.success) {
+                  this.$message({ showClose: true, type: 'success', message: '提交成功' })
                   this.handleReturn('true')
                 } else {
-                  this.$notify({
-                    title: '提交失败',
-                    message: response.msg,
-                    type: 'error'
-                  })
+                  this.submitdisabled = false
                 }
               })
             }

anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js

@@ -51,6 +51,14 @@ export function getListOrgByBrandSid(orgSid, brandSid) {
   })
 }
 
+// 根据当前登录人的分公司sid和品牌sid信息获取分公司
+export function getListOrgByBrandSidNo(orgSid, brandSid) {
+  return request({
+    url: '/portal/v1/sysorganization/getListOrgByBrandSidNo/' + orgSid + '/' + brandSid,
+    method: 'get'
+  })
+}
+
 // 根据登陆人sid查询分公司 （孟哲写的接口）
 export function getPathSidByUserSid(data) {
   return request({

anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue

@@ -198,7 +198,7 @@ import chexinglook from './chexinglook'
 import chexingpeizhi from './relation/chexingguanlianchangyong'
 import chexinggonggaoxingao from './relation/chexinggonggaoxingao'
 import upload from '../../../components/uploadFile/upload_chexing'
-import { getListOrgByBrandSid } from '@/api/cheliang/dictcommons'
+import { getListOrgByBrandSidNo } from '@/api/cheliang/dictcommons'
 
 export default {
   name: 'chexing',
@@ -385,7 +385,7 @@ export default {
       })
     },
     changeBrand(value) {
-      getListOrgByBrandSid(this.listQuery.params.createOrgSId, value).then((resp) => {
+      getListOrgByBrandSidNo(this.listQuery.params.createOrgSId, value).then((resp) => {
         if (resp.success) {
           this.org_list = resp.data
         }