From 96f41ada57fa016064ae3164b88441ac9d5f71e1 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Fri, 12 May 2023 18:02:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=9C=AA=E5=94=AE=E4=B9=B0?=
 =?UTF-8?q?=E6=96=AD--=E5=A2=9E=E5=8A=A0=E9=87=87=E8=B4=AD=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weishoumaiduanguanli/unsoldAdd.vue        | 58 +++++++++++++++----
 .../weishoumaiduanguanli/unsoldInfo.vue       | 29 ++++++++--
 .../weishoumaiduanguanli/vehicle.vue          |  4 +-
 .../weishoumaiduanguanli/vehicle.vue          |  4 +-
 .../weishoumaiduanDaiBanInfo.vue              | 14 ++++-
 .../weishoumaiduanYiBanInfo.vue               | 16 +++--
 .../weushoumaiduanEdit.vue                    | 54 ++++++++++++++---
 7 files changed, 146 insertions(+), 33 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/unsoldAdd.vue b/anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/unsoldAdd.vue
index 483cd58c04..75b4e7c8f7 100644
--- a/anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/unsoldAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/unsoldAdd.vue
@@ -41,20 +41,24 @@
           </el-row>
           <el-row>
             <el-col :span="4" class="tleftb">
-              <span>品牌</span>
+              <span>采购系统</span>
             </el-col>
             <el-col :span="4">
               <el-form-item>
-                <el-select :disabled="dialogStatus === 'edit'" v-model="formobj.carBrandName" placeholder="请选择" @change="changeCarBrand" clearable class="addinputInfo addinputOne">
-                  <el-option v-for="item in carBrand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"></el-option>
+                <el-select v-model="formobj.purchaseSystemName" placeholder="请选择" @change="changeOrgDept" clearable class="addinputInfo addinputOne">
+                  <el-option v-for="item in orgDept_list" :key="item.deptSid" :label="item.purchaseSystemName" :value="item.purchaseSystemName"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="4" class="tleftb">
-              <span>买断原因</span>
+              <span>品牌</span>
             </el-col>
             <el-col :span="4">
-              <el-form-item><el-input v-model="formobj.reason" type="textarea" :autosize="{ minRows: 1, maxRows: 10}" resize="none" clearable placeholder="" class="addinputw"></el-input></el-form-item>
+              <el-form-item>
+                <el-select :disabled="dialogStatus === 'edit'" v-model="formobj.carBrandName" placeholder="请选择" @change="changeCarBrand" clearable class="addinputInfo addinputOne">
+                  <el-option v-for="item in carBrand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"></el-option>
+                </el-select>
+              </el-form-item>
             </el-col>
             <el-col :span="4" class="tleftb">
               <span>是否需要付款</span>
@@ -66,6 +70,14 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="4" class="tleftb">
+              <span>买断原因</span>
+            </el-col>
+            <el-col :span="20">
+              <el-form-item><el-input v-model="formobj.reason" type="textarea" :autosize="{ minRows: 1, maxRows: 10}" resize="none" clearable placeholder="" class="addinputw"></el-input></el-form-item>
+            </el-col>
+          </el-row>
           <div class="title">
             <div>车辆列表</div>
             <div>
@@ -199,7 +211,7 @@
 <script>
 import req from '@/api/weishoumaiduan/unsold'
 import vehicle from './vehicle.vue'
-import { getOrgSidByPath, fetchBySid, typeValues, brandDown, selectNameByOrg } from '@/api/cheliang/dictcommons'
+import { getOrgSidByPath, fetchBySid, typeValues, brandDown, selectNameByOrg, fetchDetailsByUseOrgSid } from '@/api/cheliang/dictcommons'
 
 export default {
   name: 'weishoumaiduanAdd',
@@ -216,6 +228,7 @@ export default {
       payment_list: [],
       actualPay_list: [],
       carBrand_list: [],
+      orgDept_list: [],
       // 表单数据
       formobj: {
         sid: '', // 一条数据的sid
@@ -234,7 +247,9 @@ export default {
         carBrandName: '',
         detailsList: [],
         detailsPayList: [],
-        orgPath: ''
+        orgPath: '',
+        purchaseSystemSid: '',
+        purchaseSystemName: ''
       },
       dialogStatus: '',
       rules: {},
@@ -270,6 +285,11 @@ export default {
               this.formobj.useOrgName = res.data.name
             }
           })
+          fetchDetailsByUseOrgSid(resp.data).then((res) => {
+            if (res.success) {
+              this.orgDept_list = res.data
+            }
+          })
           brandDown({ useOrg: resp.data }).then((res) => {
             if (res.success) {
               this.carBrand_list = res.data
@@ -300,12 +320,16 @@ export default {
     },
     // 明细表添加一行数据
     addCommodity() {
+      if (this.formobj.purchaseSystemName === '') {
+        this.$message({ showClose: true, type: 'error', message: '请先选择采购系统' })
+        return
+      }
       if (this.formobj.carBrandName === '') {
         this.$message({ showClose: true, type: 'error', message: '请先选择品牌' })
         return
       }
       this.viewState = 2
-      this.$refs['divVehicle'].showData(this.formobj.detailsList, this.formobj.carBrandSid)
+      this.$refs['divVehicle'].showData(this.formobj.detailsList, this.formobj.carBrandSid, this.formobj.purchaseSystemSid)
     },
     // 明细表删除一行数据
     dataDelete(index) {
@@ -372,6 +396,18 @@ export default {
         })
       }
     },
+    changeOrgDept(value) {
+      let bb = null
+      this.orgDept_list.forEach((e) => {
+        if (e.purchaseSystemName === value) {
+          bb = {
+            name: e.purchaseSystemName,
+            sid: e.deptSid
+          }
+        }
+      })
+      this.formobj.purchaseSystemSid = bb.sid
+    },
     changeCarBrand(value) {
       let bb = null
       this.carBrand_list.forEach((e) => {
@@ -442,7 +478,7 @@ export default {
     },
     submitVehicleApply() {
       if (this.formobj.isPay == '1' && this.formobj.payAccountAll !== this.formobj.money) {
-        this.$message({ showClose:true, type: 'error', message: '因买断金额合计与付款金额合计不一致，提交失败' })
+        this.$message({ showClose: true, type: 'error', message: '因买断金额合计与付款金额合计不一致，提交失败' })
         return
       }
       req.submitVehicleApply(this.formobj).then((res) => {
@@ -534,7 +570,9 @@ export default {
         carBrandName: '',
         detailsList: [],
         detailsPayList: [],
-        orgPath: ''
+        orgPath: '',
+        purchaseSystemSid: '',
+        purchaseSystemName: ''
       }
       this.dialogStatus = ''
       this.$refs['form_obj'].resetFields()
diff --git a/anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/unsoldInfo.vue b/anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/unsoldInfo.vue
index 4b530ca2d6..f7fe05f5fb 100644
--- a/anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/unsoldInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/unsoldInfo.vue
@@ -37,16 +37,16 @@
           </el-row>
           <el-row>
             <el-col :span="4" class="tleftb">
-              <span>品牌</span>
+              <span>采购系统</span>
             </el-col>
             <el-col :span="4">
-              <el-form-item><span>{{ formobj.carBrandName }}</span></el-form-item>
+              <el-form-item><span>{{ formobj.purchaseSystemName }}</span></el-form-item>
             </el-col>
             <el-col :span="4" class="tleftb">
-              <span>买断原因</span>
+              <span>品牌</span>
             </el-col>
             <el-col :span="4">
-              <el-form-item><span>{{ formobj.reason }}</span></el-form-item>
+              <el-form-item><span>{{ formobj.carBrandName }}</span></el-form-item>
             </el-col>
             <el-col :span="4" class="tleftb">
               <span>是否需要付款</span>
@@ -57,6 +57,14 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="4" class="tleftb">
+              <span>买断原因</span>
+            </el-col>
+            <el-col :span="20">
+              <el-form-item><span>{{ formobj.reason }}</span></el-form-item>
+            </el-col>
+          </el-row>
           <div class="title">
             <div>车辆列表</div>
           </div>
@@ -179,12 +187,23 @@ export default {
       formobj: {
         sid: '', // 一条数据的sid
         applicationName: '',
+        isPay: '',
+        payAccountAll: '',
+        useOrgName: '',
+        useOrgSid: '',
+        money: '',
         createTime: '',
         reason: '',
         userSid: '',
         instanceId: '', // 流程实例ID
         taskId: '', // 任务ID
-        detailsList: []
+        carBrandSid: '',
+        carBrandName: '',
+        detailsList: [],
+        detailsPayList: [],
+        orgPath: '',
+        purchaseSystemSid: '',
+        purchaseSystemName: ''
       },
       rules: {},
       submitdisabled: false
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 2f5bb820f5..b93ee23a97 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
@@ -123,6 +123,7 @@ export default {
           location: '',
           userSid: '',
           orgPath: '',
+          purchaseSystemSid: '',
           vinNoList: []
         },
         total: 0
@@ -228,7 +229,7 @@ export default {
       })
       this.sids = aa
     },
-    showData(value, carBrandSid) {
+    showData(value, carBrandSid, purchaseSystemSid) {
       const aa = []
       if (value.length > 0) {
         for (var i = 0; i < value.length; i++) {
@@ -242,6 +243,7 @@ export default {
       this.listQuery.total = 0
       this.listQuery.size = 5
       this.listQuery.params.brandSid = carBrandSid
+      this.listQuery.params.purchaseSystemSid = purchaseSystemSid
       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 73f8022c9d..7b34d471d2 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
@@ -123,6 +123,7 @@ export default {
           location: '',
           userSid: '',
           orgPath: '',
+          purchaseSystemSid: '',
           vinNoList: []
         },
         total: 0
@@ -228,7 +229,7 @@ export default {
       })
       this.sids = aa
     },
-    showData(value, carBrandSid) {
+    showData(value, carBrandSid, purchaseSystemSid) {
       const aa = []
       if (value.length > 0) {
         for (var i = 0; i < value.length; i++) {
@@ -242,6 +243,7 @@ export default {
       this.listQuery.total = 0
       this.listQuery.size = 5
       this.listQuery.params.brandSid = carBrandSid
+      this.listQuery.params.purchaseSystemSid = purchaseSystemSid
       this.init()
     },
     // 添加修改返回
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanDaiBanInfo.vue
index 8184593e26..a9a3f24cec 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanDaiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanDaiBanInfo.vue
@@ -39,13 +39,13 @@
           </el-row>
           <el-row>
             <el-col :span="4" class="tleftb">
-              <span>品牌</span>
+              <span>采购系统</span>
             </el-col>
             <el-col :span="4">
-              <el-form-item><span>{{ formobj.carBrandName }}</span></el-form-item>
+              <el-form-item><span>{{ formobj.purchaseSystemName }}</span></el-form-item>
             </el-col>
             <el-col :span="4" class="tleftb">
-              <span>买断原因</span>
+              <span>品牌</span>
             </el-col>
             <el-col :span="4">
               <el-form-item><span>{{ formobj.reason }}</span></el-form-item>
@@ -59,6 +59,14 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="4" class="tleftb">
+              <span>买断原因</span>
+            </el-col>
+            <el-col :span="20">
+              <el-form-item><span>{{ formobj.reason }}</span></el-form-item>
+            </el-col>
+          </el-row>
           <div class="title">
             <div>车辆列表</div>
           </div>
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanYiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanYiBanInfo.vue
index 9f87f6b7b7..32b67a54dc 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanYiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanYiBanInfo.vue
@@ -37,16 +37,16 @@
           </el-row>
           <el-row>
             <el-col :span="4" class="tleftb">
-              <span>品牌</span>
+              <span>采购系统</span>
             </el-col>
             <el-col :span="4">
-              <el-form-item><span>{{ formobj.carBrandName }}</span></el-form-item>
+              <el-form-item><span>{{ formobj.purchaseSystemName }}</span></el-form-item>
             </el-col>
             <el-col :span="4" class="tleftb">
-              <span>买断原因</span>
+              <span>品牌</span>
             </el-col>
             <el-col :span="4">
-              <el-form-item><span>{{ formobj.reason }}</span></el-form-item>
+              <el-form-item><span>{{ formobj.carBrandName }}</span></el-form-item>
             </el-col>
             <el-col :span="4" class="tleftb">
               <span>是否需要付款</span>
@@ -57,6 +57,14 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="4" class="tleftb">
+              <span>买断原因</span>
+            </el-col>
+            <el-col :span="20">
+              <el-form-item><span>{{ formobj.reason }}</span></el-form-item>
+            </el-col>
+          </el-row>
           <div class="title">
             <div>车辆列表</div>
           </div>
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weushoumaiduanEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weushoumaiduanEdit.vue
index c7dff6d146..28ddb28a56 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weushoumaiduanEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weushoumaiduanEdit.vue
@@ -40,20 +40,24 @@
           </el-row>
           <el-row>
             <el-col :span="4" class="tleftb">
-              <span>品牌</span>
+              <span>采购系统</span>
             </el-col>
             <el-col :span="4">
               <el-form-item>
-                <el-select :disabled="dialogStatus === 'edit'" v-model="formobj.carBrandName" placeholder="请选择" @change="changeCarBrand" clearable class="addinputInfo addinputOne">
-                  <el-option v-for="item in carBrand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"></el-option>
+                <el-select v-model="formobj.purchaseSystemName" placeholder="请选择" @change="changeOrgDept" clearable class="addinputInfo addinputOne">
+                  <el-option v-for="item in orgDept_list" :key="item.deptSid" :label="item.purchaseSystemName" :value="item.purchaseSystemName"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="4" class="tleftb">
-              <span>买断原因</span>
+              <span>品牌</span>
             </el-col>
             <el-col :span="4">
-              <el-form-item><el-input v-model="formobj.reason" type="textarea" :autosize="{ minRows: 1, maxRows: 10}" resize="none" clearable placeholder="" class="addinputw"></el-input></el-form-item>
+              <el-form-item>
+                <el-select :disabled="dialogStatus === 'edit'" v-model="formobj.carBrandName" placeholder="请选择" @change="changeCarBrand" clearable class="addinputInfo addinputOne">
+                  <el-option v-for="item in carBrand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"></el-option>
+                </el-select>
+              </el-form-item>
             </el-col>
             <el-col :span="4" class="tleftb">
               <span>是否需要付款</span>
@@ -65,6 +69,14 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="4" class="tleftb">
+              <span>买断原因</span>
+            </el-col>
+            <el-col :span="20">
+              <el-form-item><el-input v-model="formobj.reason" type="textarea" :autosize="{ minRows: 1, maxRows: 10}" resize="none" clearable placeholder="" class="addinputw"></el-input></el-form-item>
+            </el-col>
+          </el-row>
           <div class="title">
             <div>车辆列表</div>
             <div>
@@ -198,7 +210,7 @@
 <script>
 import req from '@/api/weishoumaiduan/unsold'
 import vehicle from './vehicle.vue'
-import { brandDown, fetchBySid, getOrgSidByPath, selectNameByOrg, typeValues } from '@/api/cheliang/dictcommons'
+import { brandDown, fetchBySid, getOrgSidByPath, selectNameByOrg, typeValues, fetchDetailsByUseOrgSid } from '@/api/cheliang/dictcommons'
 
 export default {
   name: 'maiduanAdd',
@@ -215,6 +227,7 @@ export default {
       carBrand_list: [],
       payment_list: [],
       actualPay_list: [],
+      orgDept_list: [],
       // 表单数据
       formobj: {
         sid: '', // 一条数据的sid
@@ -229,11 +242,13 @@ export default {
         userSid: '',
         instanceId: '', // 流程实例ID
         taskId: '', // 任务ID
-        carBrandName: '',
         carBrandSid: '',
+        carBrandName: '',
         detailsList: [],
         detailsPayList: [],
-        orgPath: ''
+        orgPath: '',
+        purchaseSystemSid: '',
+        purchaseSystemName: ''
       },
       dialogStatus: '',
       rules: {},
@@ -272,6 +287,11 @@ export default {
               this.formobj.useOrgName = res.data.name
             }
           })
+          fetchDetailsByUseOrgSid(resp.data).then((res) => {
+            if (res.success) {
+              this.orgDept_list = res.data
+            }
+          })
           brandDown({ useOrg: resp.data }).then((res) => {
             if (res.success) {
               this.carBrand_list = res.data
@@ -302,12 +322,16 @@ export default {
     },
     // 明细表添加一行数据
     addCommodity() {
+      if (this.formobj.purchaseSystemName === '') {
+        this.$message({ showClose: true, type: 'error', message: '请先选择采购系统' })
+        return
+      }
       if (this.formobj.carBrandName === '') {
         this.$message({ showClose: true, type: 'error', message: '请先选择品牌' })
         return
       }
       this.viewState = 2
-      this.$refs['divVehicle'].showData(this.formobj.detailsList, this.formobj.carBrandSid)
+      this.$refs['divVehicle'].showData(this.formobj.detailsList, this.formobj.carBrandSid, this.formobj.purchaseSystemSid)
     },
     // 明细表删除一行数据
     dataDelete(index) {
@@ -364,6 +388,18 @@ export default {
         })
       }
     },
+    changeOrgDept(value) {
+      let bb = null
+      this.orgDept_list.forEach((e) => {
+        if (e.purchaseSystemName === value) {
+          bb = {
+            name: e.purchaseSystemName,
+            sid: e.deptSid
+          }
+        }
+      })
+      this.formobj.purchaseSystemSid = bb.sid
+    },
     changeCarBrand(value) {
       let bb = null
       this.carBrand_list.forEach((e) => {