Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -1932,8 +1932,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         if (!isDeposit) {
             return rb.setMsg("请完善订金信息");
         }
-        if(StringUtils.isNotBlank(busSalesOrder.getIsInsurance())){
+        if(StringUtils.isBlank(busSalesOrder.getIsInsurance())){
-            return rb.setMsg("请完善保险信息");
+            return rb.setMsg("请先完善保险信息");
         }else{
             if("0".equals(busSalesOrder.getIsInsurance())){
                 BusSalesOrderInsuranceDetailsVo busSalesOrderInsurance = busSalesOrderInsuranceService.details(sid);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml

@@ -63,12 +63,21 @@
                           NULL),
                        IF(LENGTH(trim(GROUP_CONCAT(overallDimension))) > 0, GROUP_CONCAT('外廓尺寸：', overallDimension),
                           NULL),
+                       IF(LENGTH(trim(GROUP_CONCAT(color))) > 0, GROUP_CONCAT('颜色：', color),
+                          NULL),
                        IF(LENGTH(trim(GROUP_CONCAT(plateMaterial))) > 0, GROUP_CONCAT('板材材质：', plateMaterial),
                           NULL),
                        IF(LENGTH(trim(GROUP_CONCAT(plateThickness))) > 0, GROUP_CONCAT('板材厚度：', plateThickness),
                           NULL),
-                       IF(LENGTH(trim(GROUP_CONCAT(announcementModel))) > 0, GROUP_CONCAT('公告型号：', announcementModel),
+                       IF(LENGTH(trim(GROUP_CONCAT(tarpaulinSlide))) > 0, GROUP_CONCAT('篷布滑道：', tarpaulinSlide),
-                          NULL), IF(LENGTH(trim(GROUP_CONCAT(topPrice))) > 0, GROUP_CONCAT('上装价格：', topPrice),
+                          NULL),
+                       IF(LENGTH(trim(GROUP_CONCAT(refirgerator))) > 0, GROUP_CONCAT('冷藏冷机：', refirgerator),
+                          NULL),
+                       IF(LENGTH(trim(GROUP_CONCAT(selfUnHyCoPl))) > 0, GROUP_CONCAT('自卸液压盖版：', selfUnHyCoPl),
+                          NULL),
+                       IF(LENGTH(trim(GROUP_CONCAT(floorHeating))) > 0, GROUP_CONCAT('底板加热：', floorHeating),
+                          NULL),
+                       IF(LENGTH(trim(GROUP_CONCAT(topPrice))) > 0, GROUP_CONCAT('上装价格：', topPrice, '元'),
                           NULL),
                        IF(LENGTH(trim(GROUP_CONCAT(moreConfig))) > 0, GROUP_CONCAT('更多配置：', moreConfig),
                           NULL),

anrui-scm/anrui-scm-ui/src/views/supplychain/diaochekaipiaoshenqingguanli/diaocheshenqingAdd.vue

@@ -35,8 +35,8 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item prop="callOutOrgSid" label="调出分公司">
-                  <el-select v-model="temp.callOutOrgSid" placeholder="请选择" clearable class="addinputw" @change="callOutOrgSidChange" :disabled="dialogStatus == 'edit'">
+                  <el-select v-model="temp.callOutOrgName" placeholder="请选择" clearable class="addinputw" @change="callOutOrgSidChange" :disabled="dialogStatus == 'edit'">
-                    <el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name" :value="item.sid"/>
+                    <el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name" :value="item.name"/>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -145,7 +145,7 @@
 <script>
 import diaochecheliangList from '@/views/supplychain/diaochekaipiaoshenqingguanli/relation/diaochecheliangList'
 import upload_diaoche from '@/components/uploadFile/upload_diaoche'
-import { getOrg, getPathSidByUserSid } from '@/api/cheliang/basevehiclemodel'
+import { getPathSidByUserSid, fetchBySid, getListOrgByBrand } from '@/api/cheliang/dictcommons'
 import { fetchDetailsBySid, save, selByLinkSid, submitSunInv } from '@/api/supplychain/diaochekaipiaoshenqing.js'
 import { typeValues } from '@/api/supplychain/yancheguanli'
 import req from '@/api/kucunguanli/changjiachuku'
@@ -164,6 +164,7 @@ export default {
       dialogVisible: false,
       dialogUrl: [],
       useOrg: '',
+      useOrgName: '',
       index: 0,
       list: [],
       vehicleList: [],
@@ -233,18 +234,10 @@ export default {
         row.invoiceTypeValue = choosetItem[0].dictValue
       }
     },
-    // 查询所有分公司
-    getListOrgAll() {
-      getOrg().then((res) => {
-        if (res.success) {
-          this.useOrg_list = res.data
-          this.getPathSid()
-        }
-      })
-    },
     callOutOrgSidChange(val) {
-      const choosetItem = this.useOrg_list.filter((item) => item.sid === val)
+      const choosetItem = this.useOrg_list.filter((item) => item.name === val)
       this.temp.callOutOrgName = choosetItem[0].name
+      this.temp.callOutOrgSid = choosetItem[0].sid
       console.log('name:', this.temp.callOutOrgName, 'key:', this.temp.callOutOrgSid)
     },
     // 根据登陆人sid查询分公司
@@ -255,8 +248,17 @@ export default {
           this.useOrg = res.data
           this.temp.createOrgSid = res.data
           this.temp.callInOrgSid = res.data
-          const name = this.useOrg_list.filter((item) => item.sid === this.temp.callInOrgSid)
+          fetchBySid(this.useOrg).then((resp) => {
-          this.temp.callInOrgName = name[0].name
+            if (resp.success) {
+              this.useOrgName = resp.data.name
+              this.temp.callInOrgName = this.useOrgName
+            }
+          })
+          getListOrgByBrand(this.useOrg).then((res) => {
+            if (res.success) {
+              this.useOrg_list = res.data
+            }
+          })
         }
       })
     },
@@ -361,7 +363,7 @@ export default {
       this.temp.createBySid = window.sessionStorage.getItem('userSid')
       this.dialogStatus = 'add'
       this.viewTitle = '【新增】调车开票申请'
-      this.getListOrgAll()
+      this.getPathSid()
       this.getType()
     },
     showEdit(row) {
@@ -381,13 +383,13 @@ export default {
       }).catch(e => {
         this.submitdisabled = false
       })
-      this.getListOrgAll()
+      this.getPathSid()
       this.getType()
     },
     handleCreate() {
       const _this = this
       for (var i = 0; i < this.list.length; i++) {
-        if (this.list[i].invoiceTypeKey == '02') {
+        if (this.list[i].invoiceTypeKey === '02') {
           this.list[i].invoicinMoney = this.list[i].witPinMoney // 增值税票:开票金额=内销价格
           this.list[i].invoicinCompanyName = this.temp.callInOrgName // 增值税票:开票单位=调入公司
           this.list[i].invoicinCompanySid = this.temp.callInOrgSid // 增值税票:开票单位=调入公司
@@ -442,13 +444,15 @@ export default {
         baseShuntingInvoicinApplyeVehs: []
       }
       this.list = []
+      this.useOrg = []
+      this.useOrgName = ''
       this.$refs['dataForm'].resetFields()
       this.$emit('doback')
     },
     handleSubmit() {
       const _this = this
       for (var i = 0; i < this.list.length; i++) {
-        if (this.list[i].invoiceTypeKey == '02') {
+        if (this.list[i].invoiceTypeKey === '02') {
           this.list[i].invoicinMoney = this.list[i].witPinMoney // 增值税票:开票金额=内销价格
           this.list[i].invoicinCompanyName = this.temp.callInOrgName // 增值税票:开票单位=调入公司
           this.list[i].invoicinCompanySid = this.temp.callInOrgSid // 增值税票:开票单位=调入公司

anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliAdd.vue

@@ -30,15 +30,15 @@
               </el-col>
               <el-col :span="8"><!-- :readonly="vehicleList[scope.$index].inboundDate" -->
                 <el-form-item prop="callOutOrgSid" label="调出分公司">
-                  <el-select v-model="temp.callOutOrgSid" placeholder="请选择" clearable class="addinputw" :disabled="temp.accadjTypeKey == '02' || dialogStatus == 'edit'" @change="callOutOrgSidChange">
+                  <el-select v-model="temp.callOutOrgName" placeholder="请选择" clearable class="addinputw" :disabled="temp.accadjTypeKey == '02' || dialogStatus == 'edit'" @change="callOutOrgSidChange">
-                    <el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name" :value="item.sid"/>
+                    <el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name" :value="item.name"/>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item prop="callInOrgSid" label="调入分公司">
-                  <el-select v-model="temp.callInOrgSid" placeholder="请选择" clearable class="addinputw" :disabled="temp.accadjTypeKey == '01' || dialogStatus == 'edit'" @change="callInOrgSidChange">
+                  <el-select v-model="temp.callInOrgName" placeholder="请选择" clearable class="addinputw" :disabled="temp.accadjTypeKey == '01' || dialogStatus == 'edit'" @change="callInOrgSidChange">
-                    <el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name" :value="item.sid"/>
+                    <el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name" :value="item.name"/>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -122,7 +122,7 @@
 <script>
 import tiaozhangcheliangList from '@/views/supplychain/tiaozhangshenqingguanli/relation/tiaozhangcheliangList'
 import { fetchDetailsBySid, save, submitAccAdjApply } from '@/api/supplychain/tiaozhangshenqing.js'
-import { getOrg, getPathSidByUserSid } from '@/api/cheliang/basevehiclemodel'
+import { getPathSidByUserSid, getListOrgByBrand, fetchBySid } from '@/api/cheliang/dictcommons'
 import { typeValues } from '@/api/cheliang/dictcommons'
 
 export default {
@@ -139,6 +139,7 @@ export default {
       list: [],
       vehicleList: [],
       useOrg: '',
+      useOrgName: '',
       accadjType_list: [],
       useOrg_list: [],
       // 表单数据
@@ -196,9 +197,14 @@ export default {
     getPathSid() {
       const userSid = window.sessionStorage.getItem('userSid')
       getPathSidByUserSid({userSid: userSid}).then((res) => {
-        if (res.code === '200') {
+        if (res.success) {
           this.useOrg = res.data
           this.temp.createOrgSid = res.data
+          fetchBySid(this.useOrg).then((resp) => {
+            if (resp.success) {
+              this.useOrgName = resp.data.name
+            }
+          })
         }
       })
     },
@@ -211,46 +217,51 @@ export default {
         }
       })
     },
-    getListOrgAll() {
-      getOrg().then((res) => {
-        if (res.success) {
-          this.useOrg_list = res.data
-        }
-      })
-    },
     accadjTypeKeyChange(val) {
       if (val) {
         const choosetItem = this.accadjType_list.filter((item) => item.dictKey === val)
         this.temp.accadjTypeValue = choosetItem[0].dictValue
         console.log('name:', this.temp.accadjTypeValue, 'key:', this.temp.accadjTypeKey)
         // 调入
-        if (this.temp.accadjTypeKey == '01') {
+        if (this.temp.accadjTypeKey === '01') {
           this.temp.callInOrgSid = this.useOrg
-          const name = this.useOrg_list.filter((item) => item.sid === this.temp.callInOrgSid)
+          // const name = this.useOrg_list.filter((item) => item.sid === this.temp.callInOrgSid)
-          this.temp.callInOrgName = name[0].name
+          this.temp.callInOrgName = this.useOrgName
           console.log('name:', this.temp.callInOrgName, 'sid:', this.temp.callInOrgSid)
           this.temp.callOutOrgName = ''
           this.temp.callOutOrgSid = ''
+          getListOrgByBrand(this.useOrg).then((resp) => {
+            if (resp.success) {
+              this.useOrg_list = resp.data
+            }
+          })
         }
         // 调出
-        if (this.temp.accadjTypeKey == '02') {
+        if (this.temp.accadjTypeKey === '02') {
           this.temp.callOutOrgSid = this.useOrg
-          const name = this.useOrg_list.filter((item) => item.sid === this.temp.callOutOrgSid)
+          // const name = this.useOrg_list.filter((item) => item.sid === this.temp.callOutOrgSid)
-          this.temp.callOutOrgName = name[0].name
+          this.temp.callOutOrgName = this.useOrgName
           console.log('name:', this.temp.callOutOrgName, 'sid:', this.temp.callOutOrgSid)
           this.temp.callInOrgName = ''
           this.temp.callInOrgSid = ''
+          getListOrgByBrand(this.useOrg).then((resp) => {
+            if (resp.success) {
+              this.useOrg_list = resp.data
+            }
+          })
         }
       }
     },
     callOutOrgSidChange(val) {
-      const choosetItem = this.useOrg_list.filter((item) => item.sid === val)
+      const choosetItem = this.useOrg_list.filter((item) => item.name === val)
       this.temp.callOutOrgName = choosetItem[0].name
+      this.temp.callOutOrgSid = choosetItem[0].sid
       console.log('name:', this.temp.callOutOrgName, 'key:', this.temp.callOutOrgSid)
     },
     callInOrgSidChange(val) {
-      const choosetItem = this.useOrg_list.filter((item) => item.sid === val)
+      const choosetItem = this.useOrg_list.filter((item) => item.name === val)
       this.temp.callInOrgName = choosetItem[0].name
+      this.temp.callInOrgSid = choosetItem[0].sid
       console.log('name:', this.temp.callInOrgName, 'key:', this.temp.callInOrgSid)
     },
     handletiaozhangcheliang() {
@@ -334,6 +345,8 @@ export default {
         accSids: [] // 调账车辆类型sid
       }
       this.list = []
+      this.useOrg = ''
+      this.useOrgName = ''
       this.$refs['dataForm'].resetFields()
       this.$emit('doback')
     },
@@ -355,7 +368,6 @@ export default {
       this.viewTitle = '【新增】分公司间调账申请'
       this.getPathSid()
       this.getType()
-      this.getListOrgAll()
     },
 
     showEdit(row) {
@@ -378,7 +390,6 @@ export default {
       })
       this.getPathSid()
       this.getType()
-      this.getListOrgAll()
     },
     handleCreate() {
       const _this = this

anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/vehicle.vue

@@ -260,6 +260,7 @@ export default {
     // 查询列表信息
     getList() {
       this.listLoading = true
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
       req.pageList(this.listQuery).then((response) => {
         this.listLoading = false
         if (response.success) {
@@ -323,7 +324,6 @@ export default {
       } else {
         this.listQuery.params.vinNoList = []
       }
-      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
       this.init()
     },
     // 添加修改返回

anrui-scm/anrui-scm-ui/src/views/workFlow/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqingEdit.vue

@@ -39,11 +39,11 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item prop="money" label="调出分公司">
-                  <el-select v-model="temp.callOutOrgSid" placeholder="请选择" clearable class="addinputw"
+                  <el-select v-model="temp.callOutOrgName" placeholder="请选择" clearable class="addinputw"
                              @change="callOutOrgSidChange"
                              :disabled="dialogStatus == 'edit'">
                     <el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name"
-                               :value="item.sid"/>
+                               :value="item.name"/>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -164,7 +164,7 @@
 <script>
 import diaochecheliangList from '@/views/supplychain/diaochekaipiaoshenqingguanli/relation/diaochecheliangList'
 import upload_diaoche from '@/components/uploadFile/upload_diaoche'
-import { getOrg, getPathSidByUserSid } from '@/api/cheliang/basevehiclemodel'
+import { getPathSidByUserSid, fetchBySid, getListOrgByBrand } from '@/api/cheliang/dictcommons'
 import { fetchDetailsBySid, save, selByLinkSid, submitSunInv } from '@/api/supplychain/diaochekaipiaoshenqing.js'
 import { typeValues } from '@/api/supplychain/yancheguanli'
 import req from '@/api/kucunguanli/changjiachuku'
@@ -183,6 +183,7 @@ export default {
       dialogVisible: false,
       dialogUrl: [],
       useOrg: '',
+      useOrgName: '',
       index: 0,
       list: [],
       vehicleList: [],
@@ -261,22 +262,14 @@ export default {
     invoiceTypeChange(row, val) {
       console.log('215545', row, val)
       if (val) {
-        const choosetItem = this.invoiceType_list.filter((item) => item.dictKey == val)
+        const choosetItem = this.invoiceType_list.filter((item) => item.dictKey === val)
         row.invoiceTypeValue = choosetItem[0].dictValue
       }
     },
-    // 查询所有分公司
-    getListOrgAll() {
-      getOrg().then((res) => {
-        if (res.success) {
-          this.useOrg_list = res.data
-          this.getPathSid()
-        }
-      })
-    },
     callOutOrgSidChange(val) {
-      const choosetItem = this.useOrg_list.filter((item) => item.sid == val)
+      const choosetItem = this.useOrg_list.filter((item) => item.name === val)
       this.temp.callOutOrgName = choosetItem[0].name
+      this.temp.callOutOrgSid = choosetItem[0].sid
       console.log('name:', this.temp.callOutOrgName, 'key:', this.temp.callOutOrgSid)
     },
     // 根据登陆人sid查询分公司
@@ -287,8 +280,17 @@ export default {
           this.useOrg = res.data
           this.temp.createOrgSid = res.data
           this.temp.callInOrgSid = res.data
-          const name = this.useOrg_list.filter((item) => item.sid == this.temp.callInOrgSid)
+          fetchBySid(this.useOrg).then((resp) => {
-          this.temp.callInOrgName = name[0].name
+            if (resp.success) {
+              this.useOrgName = resp.data.name
+              this.temp.callInOrgName = this.useOrgName
+            }
+          })
+          getListOrgByBrand(this.useOrg).then((respsone) => {
+            if (respsone.success) {
+              this.useOrg_list = respsone.data
+            }
+          })
         }
       })
     },
@@ -320,7 +322,7 @@ export default {
     },
     // 明细表添加一行数据
     handlediaocheliang() {
-      if (this.temp.callOutOrgSid == '') {
+      if (this.temp.callOutOrgSid === '') {
         this.$message({
           showClose: true,
           message: '请选择调出分公司',
@@ -328,7 +330,7 @@ export default {
         })
         return
       }
-      if (this.temp.callInOrgSid == '') {
+      if (this.temp.callInOrgSid === '') {
         this.$message({
           showClose: true,
           message: '请选择调入分公司',
@@ -382,21 +384,9 @@ export default {
           remarks: vehicleList[i].remarks,
           isAvailable: isAvailable
         })
-
       }
       console.log('车辆表数据', this.list)
     },
-    showAdd() {
-      this.$nextTick(() => {
-        this.$refs['dataForm'].clearValidate()
-      })
-      this.temp.name = window.sessionStorage.getItem('name')
-      this.temp.createBySid = window.sessionStorage.getItem('userSid')
-      this.dialogStatus = 'add'
-      this.viewTitle = '【新增】调车开票申请'
-      this.getListOrgAll()
-      this.getType()
-    },
     showEdit(businessSid, instanceId, taskId) {
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
@@ -416,13 +406,12 @@ export default {
       }).catch(e => {
         this.submitdisabled = false
       })
-      this.getListOrgAll()
+      this.getPathSid()
       this.getType()
     },
     handleCreate() {
-      const _this = this
       for (var i = 0; i < this.list.length; i++) {
-        if (this.list[i].invoiceTypeKey == '02') {
+        if (this.list[i].invoiceTypeKey === '02') {
           this.list[i].invoicinMoney = this.list[i].witPinMoney // 增值税票:开票金额=内销价格
           this.list[i].invoicinCompanyName = this.temp.callInOrgName // 增值税票:开票单位=调入公司
           this.list[i].invoicinCompanySid = this.temp.callInOrgSid // 增值税票:开票单位=调入公司
@@ -464,9 +453,8 @@ export default {
       })
     },
     handleSubmit() {
-      const _this = this
       for (var i = 0; i < this.list.length; i++) {
-        if (this.list[i].invoiceTypeKey == '02') {
+        if (this.list[i].invoiceTypeKey === '02') {
           this.list[i].invoicinMoney = this.list[i].witPinMoney // 增值税票:开票金额=内销价格
           this.list[i].invoicinCompanyName = this.temp.callInOrgName // 增值税票:开票单位=调入公司
           this.list[i].invoicinCompanySid = this.temp.callInOrgSid // 增值税票:开票单位=调入公司
@@ -512,8 +500,7 @@ export default {
         }
       })
     }
-
+  }
-  },
 }
 </script>
 

anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqingEdit.vue

@@ -36,15 +36,15 @@
               </el-col>
               <el-col :span="8"><!-- :readonly="vehicleList[scope.$index].inboundDate" -->
                 <el-form-item prop="money" label="调出分公司">
-                  <el-select v-model="temp.callOutOrgSid" placeholder="请选择" clearable class="addinputw" :disabled="temp.accadjTypeKey == '02' || dialogStatus == 'edit'" @change="callOutOrgSidChange">
+                  <el-select v-model="temp.callOutOrgName" placeholder="请选择" clearable class="addinputw" :disabled="temp.accadjTypeKey == '02' || dialogStatus == 'edit'" @change="callOutOrgSidChange">
-                    <el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name" :value="item.sid"/>
+                    <el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name" :value="item.name"/>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item prop="money" label="调入分公司">
-                  <el-select v-model="temp.callInOrgSid" placeholder="请选择" clearable class="addinputw" :disabled="temp.accadjTypeKey == '01' || dialogStatus == 'edit'" @change="callInOrgSidChange">
+                  <el-select v-model="temp.callInOrgName" placeholder="请选择" clearable class="addinputw" :disabled="temp.accadjTypeKey == '01' || dialogStatus == 'edit'" @change="callInOrgSidChange">
-                    <el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name" :value="item.sid"/>
+                    <el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name" :value="item.name"/>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -128,7 +128,7 @@
 <script>
 import tiaozhangcheliangList from './relation/tiaozhangcheliangList'
 import { fetchDetailsBySid, save, submitAccAdjApply } from '@/api/supplychain/tiaozhangshenqing.js'
-import { getOrg, getPathSidByUserSid } from '@/api/cheliang/basevehiclemodel'
+import { getPathSidByUserSid, getListOrgByBrand, fetchBySid } from '@/api/cheliang/dictcommons'
 import { typeValues } from '@/api/cheliang/dictcommons'
 
 export default {
@@ -145,6 +145,7 @@ export default {
       list: [],
       vehicleList: [],
       useOrg: '',
+      useOrgName: '',
       accadjType_list: [],
       useOrg_list: [],
       // 表单数据
@@ -212,6 +213,11 @@ export default {
         if (res.code === '200') {
           this.useOrg = res.data
           this.temp.createOrgSid = res.data
+          fetchBySid(this.useOrg).then((resp) => {
+            if (resp.success) {
+              this.useOrgName = resp.data.name
+            }
+          })
         }
       })
     },
@@ -224,46 +230,51 @@ export default {
         }
       })
     },
-    getListOrgAll() {
-      getOrg().then((res) => {
-        if (res.success) {
-          this.useOrg_list = res.data
-        }
-      })
-    },
     accadjTypeKeyChange(val) {
       if (val) {
         const choosetItem = this.accadjType_list.filter((item) => item.dictKey === val)
         this.temp.accadjTypeValue = choosetItem[0].dictValue
         console.log('name:', this.temp.accadjTypeValue, 'key:', this.temp.accadjTypeKey)
         // 调入
-        if (this.temp.accadjTypeKey == '01') {
+        if (this.temp.accadjTypeKey === '01') {
           this.temp.callInOrgSid = this.useOrg
-          const name = this.useOrg_list.filter((item) => item.sid === this.temp.callInOrgSid)
+          // const name = this.useOrg_list.filter((item) => item.sid === this.temp.callInOrgSid)
-          this.temp.callInOrgName = name[0].name
+          this.temp.callInOrgName = this.useOrgName
           console.log('name:', this.temp.callInOrgName, 'sid:', this.temp.callInOrgSid)
           this.temp.callOutOrgName = ''
           this.temp.callOutOrgSid = ''
+          getListOrgByBrand(this.useOrg).then((resp) => {
+            if (resp.success) {
+              this.useOrg_list = resp.data
+            }
+          })
         }
         // 调出
-        if (this.temp.accadjTypeKey == '02') {
+        if (this.temp.accadjTypeKey === '02') {
           this.temp.callOutOrgSid = this.useOrg
-          const name = this.useOrg_list.filter((item) => item.sid === this.temp.callOutOrgSid)
+          // const name = this.useOrg_list.filter((item) => item.sid === this.temp.callOutOrgSid)
-          this.temp.callOutOrgName = name[0].name
+          this.temp.callOutOrgName = this.useOrgName
           console.log('name:', this.temp.callOutOrgName, 'sid:', this.temp.callOutOrgSid)
           this.temp.callInOrgName = ''
           this.temp.callInOrgSid = ''
+          getListOrgByBrand(this.useOrg).then((resp) => {
+            if (resp.success) {
+              this.useOrg_list = resp.data
+            }
+          })
         }
       }
     },
     callOutOrgSidChange(val) {
-      const choosetItem = this.useOrg_list.filter((item) => item.sid === val)
+      const choosetItem = this.useOrg_list.filter((item) => item.name === val)
       this.temp.callOutOrgName = choosetItem[0].name
+      this.temp.callOutOrgSid = choosetItem[0].sid
       console.log('name:', this.temp.callOutOrgName, 'key:', this.temp.callOutOrgSid)
     },
     callInOrgSidChange(val) {
-      const choosetItem = this.useOrg_list.filter((item) => item.sid === val)
+      const choosetItem = this.useOrg_list.filter((item) => item.name === val)
       this.temp.callInOrgName = choosetItem[0].name
+      this.temp.callInOrgSid = choosetItem[0].sid
       console.log('name:', this.temp.callInOrgName, 'key:', this.temp.callInOrgSid)
     },
     handletiaozhangcheliang() {
@@ -329,26 +340,6 @@ export default {
       this.list.splice(index, 1)
     },
 
-    showAdd() {
-      this.$nextTick(() => {
-        this.$refs['dataForm'].clearValidate()
-      })
-      // this.temp.name = window.sessionStorage.getItem('name')
-      this.temp.createBySid = window.sessionStorage.getItem('userSid')
-      // req.detailsInfo(this.temp.sid).then(resp => {
-      //   const data = resp.data
-      //   this.temp.applicationCode = data.applicationCode
-      //   this.temp.createTime = data.createTime
-      // }).catch(e => {
-      //   this.submitdisabled = false
-      // })
-      this.dialogStatus = 'add'
-      this.viewTitle = '【新增】分公司间调账申请'
-      this.getPathSid()
-      this.getType()
-      this.getListOrgAll()
-    },
-
     showEdit(businessSid, instanceId, taskId) {
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
@@ -371,7 +362,6 @@ export default {
       })
       this.getPathSid()
       this.getType()
-      this.getListOrgAll()
     },
     handleCreate() {
       this.$refs['dataForm'].validate(valid => {

anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/vehicle.vue

@@ -260,6 +260,7 @@ export default {
     // 查询列表信息
     getList() {
       this.listLoading = true
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
       req.pageList(this.listQuery).then((response) => {
         this.listLoading = false
         if (response.success) {
@@ -323,7 +324,6 @@ export default {
       } else {
         this.listQuery.params.vinNoList = []
       }
-      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
       this.init()
     },
     // 添加修改返回