From fe403f615b6399213ab4a9fa90e50df667be0832 Mon Sep 17 00:00:00 2001
From: yxt_djz <313618925@qq.com>
Date: Thu, 14 Jul 2022 08:26:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=96=E9=87=87=E7=9A=84?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=9B=BE=E5=A2=9E=E5=8A=A0=E8=B4=A2=E5=8A=A1?=
 =?UTF-8?q?=E7=8E=AF=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/basevehicle/BaseVehicleService.java   |  1 -
 .../anrui/flowable/api/utils/ProcDefEnum.java |  2 +-
 .../relation/modellibrary.vue                 | 37 +++++++++++--------
 .../workFlow/caigoutuikuFlow/caigoutuiku.vue  |  1 -
 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
index 209a9e29de..91228ce23a 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
@@ -768,7 +768,6 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
                 }
             }
             record.setMoreList(moreConfigVos);
-
         }
         return iPage;
     }
diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
index 340d5da78d..8b32152125 100644
--- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
+++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
@@ -20,7 +20,7 @@ public enum ProcDefEnum {
     SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064" ),
     BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:5:292504"),//ToDo
     SALESORDER("销售订单审批流程", "process_p5ils2rn:2:245112"),
-    BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:2:285004"),//TODO
+    BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:3:365004"),//TODO
     BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:5:280004"),
     BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:2:315150"),
     SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:4:300008"), //TODO
diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/relation/modellibrary.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/relation/modellibrary.vue
index f587a24108..93666f7d71 100644
--- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/relation/modellibrary.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/relation/modellibrary.vue
@@ -91,42 +91,47 @@
         <div class="">
           <el-table  :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;font-size: 10px;" >
             <el-table-column width="60px" label="序号" type="index" :index="indexMethod" align="center"/>
-            <el-table-column label="车型" align="center">
+            <el-table-column width="100px" label="操作" align="center">
               <template slot-scope="scope">
-                <span class="bluezi" @click="handlink(scope.row)">{{ scope.row.modelName }}</span>
+                <span class="bluezi" @click="handlink(scope.row)">选择常用配置</span>
               </template>
             </el-table-column>
-            <el-table-column label="版本" align="center">
+            <el-table-column   label="车型" align="center">
+              <template slot-scope="scope">
+                <span   >{{ scope.row.modelName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column width="100px" label="版本" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.versionValue }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="燃料" align="center">
+            <el-table-column width="100px" label="燃料" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.fuelTypeValue }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="变速箱" align="center">
+            <el-table-column width="100px" label="变速箱" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.gearboxTypeValue }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="销售指导价（万元）" align="center">
+            <el-table-column width="100px" label="销售指导价（万元）" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.guidedPrice }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="现车" align="center">
+            <el-table-column width="50px" label="现车" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.nowCarNum }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="排产" align="center">
+            <el-table-column width="50px" label="排产" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.produceCarNum }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center">
+            <el-table-column width="100px" label="操作" align="center">
               <template slot-scope="scope">
                 <el-button type="primary" size="small" @click="handlook(scope.row)">查看</el-button>
               </template>
@@ -144,7 +149,7 @@
         <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
         <el-table-column label="分公司名称" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.company }}</span>
+            <span>{{ scope.row.companyName }}</span>
           </template>
         </el-table-column>
         <el-table-column label="现车" align="center">
@@ -154,7 +159,7 @@
         </el-table-column>
         <el-table-column label="排产车" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.productionCarNum }}</span>
+            <span>{{ scope.row.produceCarNum }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -375,11 +380,11 @@ export default {
     handlook(row) {
       this.dialogVisible = true
       this.dialogQuery.params.modelSid = row.sid
-      notTheCompanyModelPageList(this.dialogQuery).then((res) => {
-        if (res.code === '200') {
-          this.datalist = res.data.records
-        }
-      })
+      /*notTheCompanyModelPageList(this.dialogQuery).then((res) => {
+        if (res.code === '200') {*/
+          this.datalist = row.moreList
+        /*}
+      })*/
     },
     handlink(row) {
       this.viewState = 2
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuiku.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuiku.vue
index 3c8438f2fd..7e70e3be40 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuiku.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuiku.vue
@@ -209,7 +209,6 @@
       this.agreeList.taskId = obj.taskId
       this.agreeList.taskDefKey = obj.taskDefKey
       this.agreeList.taskName = obj.taskName
-
       // 驳回列表
       this.regectList.businessSid = obj.businessSid
       this.regectList.instanceId = obj.instanceId