From 22c951c71ed26be062f35663ed3e463f1dd3b6d5 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Fri, 9 Sep 2022 10:43:13 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=9C=AA=E5=94=AE?=
 =?UTF-8?q?=E4=B9=B0=E6=96=AD=E9=80=89=E6=8B=A9=E8=BD=A6=E8=BE=86=E5=88=97?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/weishoumaiduan/weishoumaiduanguanli/vehicle.vue   | 2 +-
 .../weishoumaiduanFlow/weishoumaiduanguanli/vehicle.vue         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/vehicle.vue b/anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/vehicle.vue
index 78e0621433..456371ac3c 100644
--- a/anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/vehicle.vue
+++ b/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()
     },
     // 添加修改返回
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/vehicle.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/vehicle.vue
index 87b38507e2..78f654556b 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/vehicle.vue
+++ b/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()
     },
     // 添加修改返回

From 3cb6a08fa0b55aa503cedc1ce4590de97ab31fd6 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Fri, 9 Sep 2022 10:56:30 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E7=AB=AF=E8=AF=A6=E6=83=85=E4=B8=AD=E6=8B=BC=E6=8E=A5=E4=B8=8A?=
 =?UTF-8?q?=E8=A3=85=E5=AD=97=E6=AE=B5=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/bussalesorder/BusSalesOrderService.java   |  4 ++--
 .../BusSalesOrderMakeupMapper.xml                 | 15 ++++++++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
index 4bad908e42..0f451d43a2 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
+++ b/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())){
-            return rb.setMsg("请完善保险信息");
+        if(StringUtils.isBlank(busSalesOrder.getIsInsurance())){
+            return rb.setMsg("请先完善保险信息");
         }else{
             if("0".equals(busSalesOrder.getIsInsurance())){
                 BusSalesOrderInsuranceDetailsVo busSalesOrderInsurance = busSalesOrderInsuranceService.details(sid);
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml
index c8f05f1fb7..2793a4d17d 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml
@@ -63,13 +63,22 @@
                           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),
-                          NULL), IF(LENGTH(trim(GROUP_CONCAT(topPrice))) > 0, GROUP_CONCAT('上装价格：', topPrice),
-                                    NULL),
+                       IF(LENGTH(trim(GROUP_CONCAT(tarpaulinSlide))) > 0, GROUP_CONCAT('篷布滑道：', tarpaulinSlide),
+                          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),
                        IF(LENGTH(trim(GROUP_CONCAT(remarks))) > 0, GROUP_CONCAT('备注：', remarks),

From 775c32b6947e8b08cb9f7b453e1269157b16735a Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Fri, 9 Sep 2022 11:04:40 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=88=86=E5=85=AC?=
 =?UTF-8?q?=E5=8F=B8=E8=B0=83=E8=BD=A6=E8=B0=83=E8=B4=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tiaozhangshenqingguanliAdd.vue            | 57 ++++++++------
 .../tiaozhangshenqingEdit.vue                 | 74 ++++++++-----------
 2 files changed, 66 insertions(+), 65 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliAdd.vue
index 54e81ad644..586d7f2d62 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliAdd.vue
+++ b/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-option v-for="item in useOrg_list" :key="item.sid" :label="item.name" :value="item.sid"/>
+                  <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.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-option v-for="item in useOrg_list" :key="item.sid" :label="item.name" :value="item.sid"/>
+                  <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.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)
-          this.temp.callInOrgName = name[0].name
+          // const name = this.useOrg_list.filter((item) => item.sid === this.temp.callInOrgSid)
+          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)
-          this.temp.callOutOrgName = name[0].name
+          // const name = this.useOrg_list.filter((item) => item.sid === this.temp.callOutOrgSid)
+          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
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqingEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqingEdit.vue
index bdf3061862..e3208e20a6 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqingEdit.vue
+++ b/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-option v-for="item in useOrg_list" :key="item.sid" :label="item.name" :value="item.sid"/>
+                  <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.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-option v-for="item in useOrg_list" :key="item.sid" :label="item.name" :value="item.sid"/>
+                  <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.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: [],
       // 表单数据
@@ -208,10 +209,15 @@ export default {
     // 根据登陆人sid查询分公司
     getPathSid() {
       const userSid = window.sessionStorage.getItem('userSid')
-      getPathSidByUserSid({userSid: userSid}).then((res) => {
+      getPathSidByUserSid({ userSid: userSid }).then((res) => {
         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)
-          this.temp.callInOrgName = name[0].name
+          // const name = this.useOrg_list.filter((item) => item.sid === this.temp.callInOrgSid)
+          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)
-          this.temp.callOutOrgName = name[0].name
+          // const name = this.useOrg_list.filter((item) => item.sid === this.temp.callOutOrgSid)
+          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 => {

From c0949352d8ebbaf00feb0f10cd14c26cf5f20bf4 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Fri, 9 Sep 2022 11:05:31 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=88=86=E5=85=AC?=
 =?UTF-8?q?=E5=8F=B8=E8=B0=83=E8=BD=A6=E5=BC=80=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diaocheshenqingAdd.vue                    | 42 +++++-----
 .../tiaochekaipiaoshenqingEdit.vue            | 79 ++++++++-----------
 2 files changed, 56 insertions(+), 65 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/diaochekaipiaoshenqingguanli/diaocheshenqingAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/diaochekaipiaoshenqingguanli/diaocheshenqingAdd.vue
index c23b5e8824..ca3b4da68a 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/diaochekaipiaoshenqingguanli/diaocheshenqingAdd.vue
+++ b/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-option v-for="item in useOrg_list" :key="item.sid" :label="item.name" :value="item.sid"/>
+                  <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.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)
-          this.temp.callInOrgName = name[0].name
+          fetchBySid(this.useOrg).then((resp) => {
+            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 // 增值税票:开票单位=调入公司
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqingEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqingEdit.vue
index 733c387a80..99dd7f6366 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqingEdit.vue
+++ b/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: [],
@@ -227,17 +228,17 @@ export default {
     var one = window.location.href.indexOf('&data') + 6
     const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
     const obj = JSON.parse(decodeURIComponent(data))
-    this.showEdit(obj.businessSid,obj.instanceId,obj.taskId)
+    this.showEdit(obj.businessSid, obj.instanceId, obj.taskId)
   },
   methods: {
     // 输入数字正则
     oninput(val, limit = 0) {
-      val = val.replace(/[^\d.]/g, '') //保留数字
-      val = val.replace(/^00/, '0.') //开头不能有两个0
-      val = val.replace(/^\./g, '0.') //开头为小数点转换为0.
-      val = val.replace(/\.{2,}/g, '.') //两个以上的小数点转换成一个
-      val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); //只保留一个小数点
-      /^0\d+/.test(val) ? val = val.slice(1) : '' //两位以上数字开头不能为0
+      val = val.replace(/[^\d.]/g, '') // 保留数字
+      val = val.replace(/^00/, '0.') // 开头不能有两个0
+      val = val.replace(/^\./g, '0.') // 开头为小数点转换为0.
+      val = val.replace(/\.{2,}/g, '.') // 两个以上的小数点转换成一个
+      val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); // 只保留一个小数点
+      /^0\d+/.test(val) ? val = val.slice(1) : '' // 两位以上数字开头不能为0
       const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
       const reg = new RegExp(str)
       if (limit === 0) {
@@ -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)
-          this.temp.callInOrgName = name[0].name
+          fetchBySid(this.useOrg).then((resp) => {
+            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: '请选择调入分公司',
@@ -341,7 +343,7 @@ export default {
       this.list.forEach(element => {
         vinNoList.push(element.purchaseSid)
       })
-      this.$refs['xuanChe'].showCheList( this.temp.callOutOrgSid, this.temp.callInOrgSid, vinNoList)
+      this.$refs['xuanChe'].showCheList(this.temp.callOutOrgSid, this.temp.callInOrgSid, vinNoList)
     },
     // 明细表删除一行数据
     dataDelete(row, index) {
@@ -382,22 +384,10 @@ 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) {
+    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>