From 14abf8fb4979321543e8caabaf21692eb8715395 Mon Sep 17 00:00:00 2001
From: yxt_djz <djz236@163.com>
Date: Fri, 2 Sep 2022 09:57:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=87=91=E8=9D=B6=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E3=80=81=E4=BE=9B=E5=BA=94=E5=95=86=E7=9A=84?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stktransferdirect/StkTransferDirect.java     | 16 ++++++++--------
 .../stktransferdirect/data_FBillEntry.json       |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stktransferdirect/StkTransferDirect.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stktransferdirect/StkTransferDirect.java
index 2301e13402..c78058c9a6 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stktransferdirect/StkTransferDirect.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stktransferdirect/StkTransferDirect.java
@@ -26,9 +26,9 @@ public class StkTransferDirect {
         @NotBlank
         public String FSrcStockStatusId;
         /*基本单位:FBaseUnitId  (必填项)*/
-        @JsonProperty("FBaseUnitId")
-        @NotBlank
-        public String FBaseUnitId;
+        //@JsonProperty("FBaseUnitId")
+       // @NotBlank
+       // public String FBaseUnitId;
         /*调入货主类型:FOwnerTypeId  (必填项)*/
         @JsonProperty("FOwnerTypeId")
         @NotBlank
@@ -78,9 +78,9 @@ public class StkTransferDirect {
         @NotBlank
         public String FDestStockId;
         /* 单位:FUnitID  (必填项)*/
-        @JsonProperty("FUnitID")
-        @NotBlank
-        public String FUnitID;
+       // @JsonProperty("FUnitID")
+       // @NotBlank
+        //public String FUnitID;
         /* 物料编码:FMaterialId  (必填项)*/
         @JsonProperty("FMaterialId")
         @NotBlank
@@ -157,11 +157,11 @@ public class StkTransferDirect {
         /*调出批号:FLot*/
         fbe.setFLot("1234567890");
         /*基本单位:FBaseUnitId  (必填项)*/
-        fbe.setFBaseUnitId("liang");
+        //fbe.setFBaseUnitId("liang");
         /* 调入仓库:FDestStockId  (必填项)*/
         fbe.setFDestStockId("CK002");
         /* 单位:FUnitID  (必填项)*/
-        fbe.setFUnitID("liang");
+        //fbe.setFUnitID("liang");
         /* 物料编码:FMaterialId  (必填项)*/
         fbe.setFMaterialId(" JX091054");
 
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_FBillEntry.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_FBillEntry.json
index 3817d41da0..1f3ce9cb83 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_FBillEntry.json
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_FBillEntry.json
@@ -3,7 +3,7 @@
     "FNumber": "@KD_FMaterialId"
   },
   "FUnitID": {
-    "FNumber": "@KD_FUnitID"
+    "FNumber": "liang"
   },
   "FDestLot":{
     "FNumber": "@KD_FDestLot"
@@ -34,7 +34,7 @@
     "FNumber": "@KD_FOwnerId"
   },
   "FBaseUnitId": {
-    "FNumber": "@KD_FBaseUnitId"
+    "FNumber": "liang"
   },
   "FBaseQty": 1.0,
   "FISFREE": false,

From 031fded0612117d045e0d41243cb2a5a49dae58a Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Fri, 2 Sep 2022 13:49:05 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=BD=A6=E8=BE=86?=
 =?UTF-8?q?=E5=A4=96=E9=87=87=EF=BC=8C=E5=A4=96=E9=87=87=E4=BE=9B=E5=BA=94?=
 =?UTF-8?q?=E5=95=86=E3=80=81=E8=BD=A6=E6=AC=BE=E8=B4=A6=E6=88=B7=E3=80=81?=
 =?UTF-8?q?=E8=AE=A2=E9=87=91=E8=B4=A6=E6=88=B7=E6=94=B9=E4=B8=BA=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E9=80=89=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../baseoutsourcingapplication.js             |  30 +-
 .../baseoutsourcingapplication.vue            |   5 +-
 .../baseoutsourcingapplicationAdd.vue         | 397 ++++++++++--------
 .../baseoutsourcingapplicationAdd.vue         | 238 ++++++-----
 .../workflow/chexingbyconfiguration.vue       | 209 +++++++++
 5 files changed, 583 insertions(+), 296 deletions(-)
 create mode 100644 anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/chexingbyconfiguration.vue

diff --git a/anrui-scm/anrui-scm-ui/src/api/baseoutsourcingapplication/baseoutsourcingapplication.js b/anrui-scm/anrui-scm-ui/src/api/baseoutsourcingapplication/baseoutsourcingapplication.js
index 4efa055521..bcec815194 100644
--- a/anrui-scm/anrui-scm-ui/src/api/baseoutsourcingapplication/baseoutsourcingapplication.js
+++ b/anrui-scm/anrui-scm-ui/src/api/baseoutsourcingapplication/baseoutsourcingapplication.js
@@ -28,7 +28,7 @@ export default {
     })
   },
   // 根据分公司sid查询分公司name
-  fetchOrgBySid: function (data) {
+  fetchOrgBySid: function(data) {
     return request({
       url: 'portal/v1/sysorganization/fetchBySid/' + data,
       method: 'get',
@@ -42,9 +42,9 @@ export default {
     })
   },
   // 根据业务sid提交外采申请审批流程
-  doSubmitBySid: function(sid,userSid) {
+  doSubmitBySid: function(sid, userSid) {
     return request({
-      url: '/base/baseoutsourcingapplication/submitBaseOutSourcingApplicationBySid/' + sid+'/'+userSid,
+      url: '/base/baseoutsourcingapplication/submitBaseOutSourcingApplicationBySid/' + sid + '/' + userSid,
       method: 'post'
     })
   },
@@ -74,14 +74,14 @@ export default {
   },
 
 // 读取xml文件
-  readXml: function (deployId) {
+  readXml: function(deployId) {
     return request({
       url: '/base/baseoutsourcingapplication/readXml/' + deployId,
       method: 'get'
     })
   },
   // 读取image文件
-  getFlowViewer: function (procInsId) {
+  getFlowViewer: function(procInsId) {
     return request({
       url: '/base/baseoutsourcingapplication/flowViewer/' + procInsId,
       method: 'get'
@@ -121,7 +121,7 @@ export default {
     })
   },
   // 撤回任务
-  revokeTask: function (params) {
+  revokeTask: function(params) {
     return request({
       url: '/base/baseoutsourcingapplication/revokeProcess',
       method: 'post',
@@ -150,11 +150,11 @@ export default {
       }
     })
   },
-  getUsers: function(orgsid,roleSid) {
+  getUsers: function(orgsid, roleSid) {
     return request({
       url: '/base/baseoutsourcingapplication/getUsers',
       method: 'get',
-      params:{orgSid:orgsid,roleSid:roleSid},
+      params: { orgSid: orgsid, roleSid: roleSid },
       headers: {
         'Content-Type': 'application/json'
       }
@@ -169,5 +169,19 @@ export default {
         'Content-Type': 'application/json'
       }
     })
+  },
+  // 获取外采供应商的信息
+  wcgysNamesDown: function(data) {
+    return request({
+      url: '/base/v1/basemanufacturer/wcgysNamesDown/' + data,
+      method: 'get'
+    })
+  },
+  // 获取开户行信息
+  bankNamesDown: function(data) {
+    return request({
+      url: '/base/v1/basemanufacturer/bankNamesDown/' + data,
+      method: 'get'
+    })
   }
 }
diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplication.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplication.vue
index 3ad5892cd0..315ddc6d9e 100644
--- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplication.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplication.vue
@@ -37,7 +37,7 @@
             <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
             <el-table-column width="150px" label="操作" align="center">
               <template slot-scope="scope">
-                <el-button v-if="scope.row.nodeState=='待提交'||(scope.row.nodeState!='待提交'&&scope.row.nodeState=='外采申请')" type="primary" size="mini" @click="edit(scope.row)">办理
+                <el-button v-if="scope.row.nodeState=='待提交'||(scope.row.nodeState!='待提交'&&scope.row.nodeState=='外采申请')" type="primary" size="mini" @click="toEdit(scope.row)">办理
                 </el-button>
                 <el-button v-else type="info" size="mini">办理</el-button>
                 <el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
@@ -185,9 +185,6 @@ export default {
         case 'toAdd':
           this.toAdd()
           break
-        case 'toEdit':
-          this.toEdit()
-          break
         case 'doDel':
           this.doDel()
           break
diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue
index 262d7b2036..54bec0f751 100644
--- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue
@@ -18,19 +18,19 @@
               <span>分公司名称</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item prop="applicationCode">{{ formobj.useOrgName }}</el-form-item>
+              <el-form-item>{{ formobj.useOrgName }}</el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
               <span>申请人</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item prop="createByName">{{ formobj.createByName }}</el-form-item>
+              <el-form-item>{{ formobj.createByName }}</el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
               <span>申请日期</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item prop="applicationDate">{{ formobj.applicationDate }}</el-form-item>
+              <el-form-item>{{ formobj.applicationDate }}</el-form-item>
             </el-col>
           </el-row>
           <!--	<el-row>
@@ -47,10 +47,9 @@
               <span><span class="icon">*</span>车型</span>
             </el-col>
             <el-col :span="19">
-              <el-form-item prop="modelName">{{ formobj.modelName }}</el-form-item>
+              <el-form-item>{{ formobj.modelName }}</el-form-item>
             </el-col>
             <el-col :span="2">
-              <!--<button  type="primary" size="small"  @click="saveOrUpdate">选择</button>-->
               <el-form-item>
                 <el-button type="primary" size="small" @click="selectModel">选择</el-button>
               </el-form-item>
@@ -61,7 +60,7 @@
               <span>常用配置</span>
             </el-col>
             <el-col :span="21" class="trightb tlineheightb">
-              <el-form-item prop="configName">{{ formobj.configName }}</el-form-item>
+              <el-form-item>{{ formobj.configName }}</el-form-item>
             </el-col>
           </el-row>
           <el-row>
@@ -69,7 +68,7 @@
               <span>内部编码</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item prop="">
+              <el-form-item>
                 <span>{{ formobj.insideCode }}</span>
               </el-form-item>
             </el-col>
@@ -77,13 +76,13 @@
               <span>销售指导价</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item prop="guidedPrice">{{ formobj.guidedPrice }}</el-form-item>
+              <el-form-item>{{ formobj.guidedPrice }}</el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
               <span>厂家合同价</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item prop="manufactorSettlementPrice">
+              <el-form-item>
                 <el-input v-model="formobj.manufactorSettlementPrice" class="addinputw" clearable></el-input>
               </el-form-item>
             </el-col>
@@ -94,7 +93,9 @@
             </el-col>
             <el-col :span="13">
               <el-form-item prop="purchasingUnitName">
-                <el-input v-model="formobj.purchasingUnitName" placeholder="" class="addinputw" clearable/>
+                <el-select v-model="formobj.purchasingUnitName" filterable placeholder="请选择" @change="changeWcgys">
+                  <el-option v-for="item in wcgys_list" :key="item.sid" :label="item.manufacturerName" :value="item.manufacturerName"></el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
@@ -103,7 +104,7 @@
             <el-col :span="5">
               <el-form-item prop="isBeforePayment">
                 <el-radio v-model="formobj.isBeforePayment" @change="changeRadio" label="1">是</el-radio>
-                <el-radio v-model="formobj.isBeforePayment" @change="changeRadio" label="0">否</el-radio>
+                <el-radio v-model="formobj.isBeforePayment" label="0">否</el-radio>
               </el-form-item>
             </el-col>
           </el-row>
@@ -140,7 +141,9 @@
             </el-col>
             <el-col :span="5">
               <el-form-item prop="accountName">
-                <el-input v-model="formobj.accountName" placeholder="" class="addinputw" clearable/>
+                <el-select v-model="formobj.accountName" filterable placeholder="请选择" @change="changeAccountName">
+                  <el-option v-for="item in account_list" :key="item.bankAccount" :label="item.accountName" :value="item.accountName"></el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
@@ -148,7 +151,7 @@
             </el-col>
             <el-col :span="5">
               <el-form-item>
-                <el-input v-model="formobj.depositBankName" placeholder="" class="addinputw" clearable/>
+                <span>{{ formobj.depositBankName }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
@@ -156,7 +159,7 @@
             </el-col>
             <el-col :span="5">
               <el-form-item>
-                <el-input v-model="formobj.bankAccount" placeholder="" class="addinputw" clearable/>
+                <span>{{ formobj.bankAccount }}</span>
               </el-form-item>
             </el-col>
           </el-row>
@@ -166,7 +169,9 @@
             </el-col>
             <el-col :span="5">
               <el-form-item>
-                <el-input v-model="formobj.modelAccountName" placeholder="" class="addinputw" clearable/>
+                <el-select v-model="formobj.modelAccountName" filterable placeholder="请选择" @change="changeModelAccountName">
+                  <el-option v-for="item in account_list" :key="item.bankAccount" :label="item.accountName" :value="item.accountName"></el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
@@ -174,7 +179,7 @@
             </el-col>
             <el-col :span="5">
               <el-form-item>
-                <el-input size="small" v-model="formobj.modelBankName" placeholder="" class="addinputw" clearable/>
+                <span>{{ formobj.modelBankName }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
@@ -182,7 +187,7 @@
             </el-col>
             <el-col :span="5">
               <el-form-item>
-                <el-input v-model="formobj.modelBankAccount" placeholder="" class="addinputw" clearable/>
+                <span>{{ formobj.modelBankAccount }}</span>
               </el-form-item>
             </el-col>
           </el-row>
@@ -191,7 +196,7 @@
               <span>其他费用名称</span>
             </el-col>
             <el-col :span="13">
-              <el-form-item prop="expenseName">
+              <el-form-item>
                 <el-input v-model="formobj.expenseName" placeholder="" class="addinputw" clearable/>
               </el-form-item>
             </el-col>
@@ -199,7 +204,7 @@
               <span>其他费用合计</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item prop="totalExpenseAmount">
+              <el-form-item>
                 <el-input v-model="formobj.totalExpenseAmount" placeholder="" class="addinputw" clearable/>
               </el-form-item>
             </el-col>
@@ -209,7 +214,7 @@
               <span>备注</span>
             </el-col>
             <el-col :span="21">
-              <el-form-item prop="remarks">
+              <el-form-item>
                 <el-input v-model="formobj.remarks" placeholder="" class="addinputw" clearable/>
               </el-form-item>
             </el-col>
@@ -272,7 +277,8 @@ import { getPathSidByUserSid } from '@/api/cheliang/basevehiclemodel'
 export default {
   name: 'BaseOutsourcingApplicationAdd',
   components: {
-    modellibrary, configuration
+    modellibrary,
+    configuration
   },
   data() {
     return {
@@ -280,7 +286,6 @@ export default {
         token: getStorage()
       },
       // 点击提交按钮显示弹框
-      nodeDialogVisible: false,
       selectedSids: '',
       vehicleDialogVisible: false,
       dialogVisible: false,
@@ -294,6 +299,8 @@ export default {
       uploadAction: process.env.VUE_APP_BASE_API + '/base/file/upload',
       filType: '.pdf,.docx,.doc',
       fileList: [],
+      wcgys_list: [], // 外采供应商
+      account_list: [],
       formobj: {
         remarks: '',
         useOrgName: '',
@@ -312,11 +319,12 @@ export default {
         modelBankAccount: '',
         staffSid: window.sessionStorage.getItem('staffSid'),
         applicationCode: '', // 申请编号
-        createByName: window.sessionStorage.getItem('name'), // 申请人姓名
+        createByName: '', // 申请人姓名
         applicationDate: '', // 申请日期
         externalMiningTypeKey: '1', // 外采类型key
         externalMiningTypeValue: '', // 外采类型value
         purchasingUnitName: '', // 采购单位名称
+        purchasingUnitSid: '',
         modelSid: '', // 车型sid
         modelName: '', // 车型名称
         configName: '', // 常用配置名称
@@ -332,36 +340,18 @@ export default {
         baseOutsourcingApplicationVehicleDtos: [],
         businessSid: '',
         taskId: '',
-        comment: '',
         instanceId: '',
         modelId: ''
       },
       rules: {
-        createByName: [{ required: true, message: '申请人姓名不能为空', trigger: 'blur' }], // 申请人姓名
-        externalMiningTypeKey: [{ required: true, message: '外采类型key不能为空', trigger: 'blur' }], // 外采类型key
-        externalMiningTypeValue: [{ required: true, message: '外采类型value不能为空', trigger: 'blur' }], // 外采类型value
-        purchasingUnitName: [{ required: true, message: '外采供应商不能为空', trigger: 'blur' }], // 采购单位名称
+        purchasingUnitName: [{ required: true, message: '外采供应商不能为空', trigger: 'change' }], // 采购单位名称
         accountName: [{ required: true, message: '车款账户不能为空', trigger: 'blur' }], // 车款账户
-        depositBankName: [{ required: true, message: '车款开户银行不能为空', trigger: 'blur' }], // 采购单位名称
-        bankAccount: [{ required: true, message: '车款银行账号不能为空', trigger: 'blur' }], // 采购单位名称
-        modelBankName: [{ required: true, message: '订金开户银行不能为空', trigger: 'blur' }], // 采购单位名称
-        modelBankAccount: [{ required: true, message: '订金银行账号不能为空', trigger: 'blur' }], // 采购单位名称
-        modelSid: [{ required: true, message: '车型不能为空', trigger: 'blur' }], // 车型sid
-        configSid: [{ required: true, message: '常用配置不能为空', trigger: 'blur' }], // 常用配置名称
         purchasePrice: [{ required: true, message: '采购价格不能为空', trigger: 'blur' }], // 采购价格
-        // guidedPrice: [{ required: true, message: '销售指导价不能为空', trigger: 'blur' }], // 销售指导价
-        manufactorSettlementPrice: [{ required: true, message: '厂家合同价不能为空', trigger: 'blur' }], // 厂家合同价
         num: [{ required: true, message: '台数不能为空', trigger: 'blur' }], // 台数
-        deposit: [{ required: true, message: '订金不能为空', trigger: 'blur' }], // 订金
-        // expenseName: [{ required: true, message: '费用名称不能为空', trigger: 'blur' }], // 费用名称
-        // totalExpenseAmount: [{ required: true, message: '费用金额合计不能为空', trigger: 'blur' }], // 费用金额合计
-        orgSid: [{ required: true, message: '部门sid不能为空', trigger: 'blur' }] // 部门sid
+        deposit: [{ required: true, message: '订金不能为空', trigger: 'blur' }] // 订金
       }
     }
   },
-  created() {
-    this.getPathSid()
-  },
   methods: {
     // 下载附件
     handleDown(row) {
@@ -387,13 +377,18 @@ export default {
       // 发送请求
       xhr.send()
     },
-    // 孟哲接口
-    getPathSid() {
-      const userSid = window.sessionStorage.getItem('userSid')
-      getPathSidByUserSid({ userSid: userSid }).then((res) => {
+    init() {
+      getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
         if (res.success) {
-          req.fetchOrgBySid(res.data).then((ress) => {
-            this.formobj.useOrgName = ress.data.name
+          req.fetchOrgBySid(res.data).then((resp) => {
+            if (resp.success) {
+              this.formobj.useOrgName = resp.data.name
+            }
+          })
+          req.wcgysNamesDown(res.data).then((response) => {
+            if (response.success) {
+              this.wcgys_list = response.data
+            }
           })
         }
       })
@@ -405,18 +400,6 @@ export default {
         fileSize: file.response.data.size
       }
     },
-    quedingVehicle() {
-      var obj = this.$refs['cheliang'].getSids()
-      var length = obj.length
-
-      if (length < 1) {
-        alert('必须选择一条数据!')
-        return
-      }
-      this.formobj.num = length
-      this.formobj.baseOutsourcingApplicationVehicleDtos = obj
-      this.vehicleDialogVisible = false
-    },
     resetState() {
       this.viewState = 1
     },
@@ -432,7 +415,6 @@ export default {
       this.formobj.configSid = info[0].configSid // 常用配置sid
       this.formobj.guidedPrice = info[0].guidedPrice// 销售指导价
       this.formobj.insideCode = info[0].insideCode// 内部编码
-      // this.formobj.manufactorSettlementPrice = info[0].manufactorSettlementPrice// 厂家合同价
     },
     selectVehicleDialog() {
       var objs = this.formobj.baseOutsourcingApplicationVehicleDtos
@@ -448,37 +430,8 @@ export default {
       this.vehicleDialogVisible = true
       this.$refs.cheliang.dosearch()
     },
-    handleReturn(isreload) {
-      if (isreload === 'true') this.$emit('reloadlist')
-      this.formobj.id = ''
-      this.formobj.accountName = ''
-      this.formobj.sid = '' // SID
-      this.applicationCode = '' // 申请编号
-      this.createByName = '' // 申请人姓名
-      this.applicationDate = '' // 申请日期
-      this.externalMiningTypeKey = '' // 外采类型key
-      this.externalMiningTypeValue = '' // 外采类型value
-      this.purchasingUnitName = '' // 采购单位名称
-      this.modelSid = '' // 车型sid
-      this.modelName = '' // 车型名称
-      this.configName = '' // 常用配置名称
-      this.purchasePrice = '' // 采购价格
-      this.guidedPrice = '' // 销售指导价
-      this.manufactorSettlementPrice = '' // 厂家合同价
-      this.num = '' // 台数
-      this.deposit = '' // 订金
-      this.expenseName = '' // 费用名称
-      this.totalExpenseAmount = '' // 费用金额合计  this.$store.getters.userInfo.orgSid,
-      this.orgSid = ''
-      this.formobj.isBeforePayment = ''
-      this.formobj.modelBankName = ''
-      this.formobj.modelBankAccount = ''
-      this.formobj.modelAccountName = ''
-      this.$refs['form_obj'].resetFields()
-      this.$emit('doback')
-    },
-
     showAdd() {
+      this.init()
       var nowDate = new Date()
       var date = {
         year: nowDate.getFullYear(),
@@ -487,10 +440,8 @@ export default {
       }
       var dayDate = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day)
       this.formobj.applicationDate = dayDate
+      this.formobj.createByName = window.sessionStorage.getItem('name')
       this.formobj.contract = {}
-      this.formobj.depositBankName = ''
-      this.formobj.bankAccount = ''
-      // this.formobj.isBeforePayment = '0'
       this.fileList = []
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
@@ -499,6 +450,7 @@ export default {
     },
     showEdit(row) {
       console.log(row)
+      this.init()
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
@@ -506,98 +458,109 @@ export default {
       this.formobj.sid = row.sid // SID
       this.businessSid = row.sid // SID
       req.fetchBySid(row.sid).then((resp) => {
-          if (resp.success) {
-            const vdata = resp.data
-            this.fileList = []
-            if (vdata.contract !== null) {
-              this.fileList.push({
-                name: vdata.contract.fileName,
-                url: vdata.contract.filePath
-              })
-            }
-            this.formobj.contract = vdata.contract
-            this.formobj.accountName = vdata.accountName
-            this.formobj.remarks = vdata.remarks
-            this.formobj.insideCode = vdata.insideCode
-            this.formobj.businessSid = row.sid
-            this.formobj.taskId = vdata.taskId
-            this.formobj.instanceId = vdata.procInstSid
-            this.formobj.modelId = vdata.procDefId
-            this.formobj.useOrgName = vdata.useOrgName
-            this.formobj.modelBankName = vdata.modelBankName
-            this.formobj.modelBankAccount = vdata.modelBankAccount
-            this.formobj.isBeforePayment = vdata.isBeforePayment
-            this.formobj.modelAccountName = vdata.modelAccountName
-            this.formobj.depositBankName = vdata.depositBankName
-            this.formobj.bankAccount = vdata.bankAccount
-            this.formobj.applicationCode = vdata.applicationCode // 申请编号
-            this.formobj.createByName = vdata.createByName // 申请人姓名
-            this.formobj.applicationDate = vdata.applicationDate // 申请日期
-            this.formobj.externalMiningTypeKey = vdata.externalMiningTypeKey // 外采类型key
-            this.formobj.externalMiningTypeValue = vdata.externalMiningTypeValue // 外采类型value
-            this.formobj.purchasingUnitName = vdata.purchasingUnitName // 采购单位名称
-            this.formobj.modelSid = vdata.modelSid // 车型sid
-            this.formobj.modelName = vdata.modelName // 车型名称
-            this.formobj.configName = vdata.configName // 常用配置名称
-            this.formobj.configSid = vdata.configSid // 常用配置sid
-            this.formobj.purchasePrice = vdata.purchasePrice // 采购价格
-            this.formobj.guidedPrice = vdata.guidedPrice // 销售指导价
-            this.formobj.manufactorSettlementPrice = vdata.manufactorSettlementPrice // 厂家合同价
-            this.formobj.num = vdata.num // 台数
-            this.formobj.deposit = vdata.deposit // 订金
-            this.formobj.expenseName = vdata.expenseName // 费用名称
-            this.formobj.totalExpenseAmount = vdata.totalExpenseAmount // 费用金额合计
-            this.formobj.orgSid = vdata.orgSid // 部门sid
-            this.formobj.baseOutsourcingApplicationVehicleDtos = vdata.baseOutsourcingApplicationVehicleVos // 部门sid
-          } else {
-            // 根据resp.code进行异常情况处理
+        if (resp.success) {
+          const vdata = resp.data
+          this.fileList = []
+          if (vdata.contract !== null) {
+            this.fileList.push({
+              name: vdata.contract.fileName,
+              url: vdata.contract.filePath
+            })
           }
-        }).catch(e => {
-          console.log(e)
-        })
+          this.formobj.contract = vdata.contract
+          this.formobj.accountName = vdata.accountName
+          this.formobj.remarks = vdata.remarks
+          this.formobj.insideCode = vdata.insideCode
+          this.formobj.businessSid = row.sid
+          this.formobj.taskId = vdata.taskId
+          this.formobj.instanceId = vdata.procInstSid
+          this.formobj.modelId = vdata.procDefId
+          this.formobj.useOrgName = vdata.useOrgName
+          this.formobj.modelBankName = vdata.modelBankName
+          this.formobj.modelBankAccount = vdata.modelBankAccount
+          this.formobj.isBeforePayment = vdata.isBeforePayment
+          this.formobj.modelAccountName = vdata.modelAccountName
+          this.formobj.depositBankName = vdata.depositBankName
+          this.formobj.bankAccount = vdata.bankAccount
+          this.formobj.applicationCode = vdata.applicationCode // 申请编号
+          this.formobj.createByName = vdata.createByName // 申请人姓名
+          this.formobj.applicationDate = vdata.applicationDate // 申请日期
+          this.formobj.externalMiningTypeKey = vdata.externalMiningTypeKey // 外采类型key
+          this.formobj.externalMiningTypeValue = vdata.externalMiningTypeValue // 外采类型value
+          this.formobj.purchasingUnitName = vdata.purchasingUnitName // 采购单位名称
+          this.formobj.purchasingUnitSid = vdata.purchasingUnitSid
+          this.formobj.modelSid = vdata.modelSid // 车型sid
+          this.formobj.modelName = vdata.modelName // 车型名称
+          this.formobj.configName = vdata.configName // 常用配置名称
+          this.formobj.configSid = vdata.configSid // 常用配置sid
+          this.formobj.purchasePrice = vdata.purchasePrice // 采购价格
+          this.formobj.guidedPrice = vdata.guidedPrice // 销售指导价
+          this.formobj.manufactorSettlementPrice = vdata.manufactorSettlementPrice // 厂家合同价
+          this.formobj.num = vdata.num // 台数
+          this.formobj.deposit = vdata.deposit // 订金
+          this.formobj.expenseName = vdata.expenseName // 费用名称
+          this.formobj.totalExpenseAmount = vdata.totalExpenseAmount // 费用金额合计
+          this.formobj.orgSid = vdata.orgSid // 部门sid
+          this.formobj.baseOutsourcingApplicationVehicleDtos = vdata.baseOutsourcingApplicationVehicleVos // 部门sid
+        }
+      }).catch(e => {
+        console.log(e)
+      })
     },
-    changeRadio(val) {
-      if (val == 0) {
-        this.formobj.accountName = this.formobj.purchasingUnitName
-      } else if (val == 1) {
-        this.formobj.modelAccountName = ''
-        this.formobj.modelBankName = ''
-        this.formobj.modelBankAccount = ''
-        this.formobj.accountName = this.formobj.purchasingUnitName
-        this.formobj.deposit = 0
-      }
+    changeWcgys(value) {
+      let bb = null
+      this.wcgys_list.forEach((e) => {
+        if (e.manufacturerName === value) {
+          bb = {
+            sid: e.sid,
+            name: e.manufacturerName
+          }
+        }
+      })
+      this.formobj.purchasingUnitSid = bb.sid
+      this.formobj.accountName = ''
+      this.formobj.depositBankName = ''
+      this.formobj.bankAccount = ''
+      this.formobj.modelAccountName = ''
+      this.formobj.modelBankName = ''
+      this.formobj.modelBankAccount = ''
+      req.bankNamesDown(bb.sid).then((ress) => {
+        if (ress.success) {
+          this.account_list = ress.data
+        }
+      })
     },
-    handleClose() {
-      this.vehicleDialogVisible = false
-      this.dialogVisible = false
+    changeAccountName(value) {
+      let bb = null
+      this.account_list.forEach((e) => {
+        if (e.accountName === value) {
+          bb = {
+            bankAccount: e.bankAccount,
+            depositBank: e.depositBank
+          }
+        }
+      })
+      this.formobj.depositBankName = bb.depositBank
+      this.formobj.bankAccount = bb.bankAccount
     },
-    doSubmit() {
-      // var contract = this.formobj.contract
-      // if (contract.fileName === '' || contract.fileName === null || contract.fileName === undefined) {
-      //   this.$message({ showClose: true, type: 'error', message: '合同附件不能为空' })
-      //   return
-      // }
-      if (this.formobj.isBeforePayment === '' || this.formobj.isBeforePayment === null) {
-        this.$message({ showClose: true, type: 'error', message: '请检查是否先付款已选择' })
-        return
-      }
-      // 提交的代码
-      // this.submitdisabled = true
-      this.formobj.userSid = window.sessionStorage.getItem('userSid')
-      this.formobj.orgSid = this.$store.getters.orgSid
-      // 查验下一环节要用到，流程定义的id
-      req.doSubmit(this.formobj).then(resp => {
-        this.submitdisabled = false
-        if (resp.success) {
-          // 加提交后的逻辑
-          this.$message({ showClose: true, type: 'success', message: resp.msg })
-          this.handleReturn('true')
-        } else {
-          // 根据resp.code进行异常情况处理
+    changeModelAccountName(value) {
+      let bb = null
+      this.account_list.forEach((e) => {
+        if (e.accountName === value) {
+          bb = {
+            bankAccount: e.bankAccount,
+            depositBank: e.depositBank
+          }
         }
-      }).catch(() => {
-        this.submitdisabled = false
       })
+      this.formobj.modelBankName = bb.depositBank
+      this.formobj.modelBankAccount = bb.bankAccount
+    },
+    changeRadio() {
+      this.formobj.modelAccountName = ''
+      this.formobj.modelBankName = ''
+      this.formobj.modelBankAccount = ''
+      this.formobj.deposit = 0
     },
     saveOrUpdate() {
       this.formobj.userSid = window.sessionStorage.getItem('userSid')
@@ -607,6 +570,10 @@ export default {
       } else if (this.formobj.externalMiningTypeKey == '2') {
         this.formobj.externalMiningTypeValue = '政策外采'
       }
+      if (this.formobj.modelName === '' || this.formobj.modelName === null) {
+        this.$message({ showClose: true, type: 'error', message: '车型不能为空,请选择车型' })
+        return
+      }
       this.$refs['form_obj'].validate(valid => {
         if (valid) {
           this.submitdisabled = true
@@ -626,6 +593,40 @@ export default {
         }
       })
     },
+    doSubmit() {
+      // var contract = this.formobj.contract
+      // if (contract.fileName === '' || contract.fileName === null || contract.fileName === undefined) {
+      //   this.$message({ showClose: true, type: 'error', message: '合同附件不能为空' })
+      //   return
+      // }
+      if (this.formobj.isBeforePayment === '' || this.formobj.isBeforePayment === null) {
+        this.$message({ showClose: true, type: 'error', message: '请检查是否先付款已选择' })
+        return
+      }
+      if (this.formobj.modelName === '' || this.formobj.modelName === null) {
+        this.$message({ showClose: true, type: 'error', message: '车型不能为空,请选择车型' })
+        return
+      }
+      // 提交的代码
+      // this.submitdisabled = true
+      this.formobj.userSid = window.sessionStorage.getItem('userSid')
+      this.formobj.orgSid = this.$store.getters.orgSid
+      // 查验下一环节要用到，流程定义的id
+      this.$refs['form_obj'].validate(valid => {
+        if (valid) {
+          req.doSubmit(this.formobj).then(resp => {
+            this.submitdisabled = false
+            if (resp.success) {
+              // 加提交后的逻辑
+              this.$message({ showClose: true, type: 'success', message: resp.msg })
+              this.handleReturn('true')
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        }
+      })
+    },
     closePage() {
       this.viewState = 1
     },
@@ -645,6 +646,40 @@ export default {
         this.formobj.num = this.formobj.num - 1
       }).catch(() => {
       })
+    },
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
+      this.formobj.id = ''
+      this.formobj.insideCode = ''
+      this.formobj.accountName = ''
+      this.formobj.depositBankName = ''
+      this.formobj.bankAccount = ''
+      this.formobj.sid = '' // SID
+      this.formobj.applicationCode = '' // 申请编号
+      this.formobj.createByName = '' // 申请人姓名
+      this.formobj.applicationDate = '' // 申请日期
+      this.formobj.externalMiningTypeKey = '' // 外采类型key
+      this.formobj.externalMiningTypeValue = '' // 外采类型value
+      this.formobj.purchasingUnitName = '' // 采购单位名称
+      this.formobj.purchasingUnitSid = ''
+      this.formobj.modelSid = '' // 车型sid
+      this.formobj.modelName = '' // 车型名称
+      this.formobj.configName = '' // 常用配置名称
+      this.formobj.purchasePrice = '' // 采购价格
+      this.formobj.guidedPrice = '' // 销售指导价
+      this.formobj.manufactorSettlementPrice = '' // 厂家合同价
+      this.formobj.num = '' // 台数
+      this.formobj.deposit = '' // 订金
+      this.formobj.expenseName = '' // 费用名称
+      this.formobj.totalExpenseAmount = '' // 费用金额合计  this.$store.getters.userInfo.orgSid,
+      this.formobj.orgSid = ''
+      this.formobj.isBeforePayment = ''
+      this.formobj.modelBankName = ''
+      this.formobj.modelBankAccount = ''
+      this.formobj.modelAccountName = ''
+      this.formobj.remarks = ''
+      this.$refs['form_obj'].resetFields()
+      this.$emit('doback')
     }
   }
 }
diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd.vue
index bf0c51f0d6..e3dca181a6 100644
--- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd.vue
@@ -6,7 +6,7 @@
         <div>
           <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
           <el-button type="primary" size="small" :disabled="submitdisabled" @click="handleSubmit">提交</el-button>
-          <el-button type="info" size="small" @click="handleReturn()">返回</el-button>
+<!--          <el-button type="info" size="small" @click="handleReturn()">返回</el-button>-->
         </div>
       </div>
       <div>
@@ -18,19 +18,19 @@
               <span><span class="icon">*</span>分公司名称</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item prop="applicationCode">{{ formobj.useOrgName }}</el-form-item>
+              <el-form-item>{{ formobj.useOrgName }}</el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
               <span><span class="icon">*</span>申请人</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item prop="createByName">{{ formobj.createByName }}</el-form-item>
+              <el-form-item>{{ formobj.createByName }}</el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
               <span><span class="icon">*</span>申请日期</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item prop="applicationDate">{{ formobj.applicationDate }}</el-form-item>
+              <el-form-item>{{ formobj.applicationDate }}</el-form-item>
             </el-col>
           </el-row>
           <!--	<el-row>
@@ -47,11 +47,10 @@
               <span><span class="icon">*</span>车型</span>
             </el-col>
             <el-col :span="19">
-              <el-form-item prop="modelName">{{ formobj.modelName }}</el-form-item>
+              <el-form-item>{{ formobj.modelName }}</el-form-item>
             </el-col>
             <el-col :span="2">
               <el-form-item>
-                <!--<button  type="primary" size="small"  @click="saveOrUpdate">选择</button>-->
                 <el-button type="primary" size="small" @click="selectModel">选择</el-button>
               </el-form-item>
             </el-col>
@@ -61,7 +60,7 @@
               <span><span class="icon">*</span>常用配置</span>
             </el-col>
             <el-col :span="21" class="trightb tlineheightb">
-              <el-form-item prop="configName">{{ formobj.configName }}</el-form-item>
+              <el-form-item>{{ formobj.configName }}</el-form-item>
             </el-col>
           </el-row>
           <el-row>
@@ -69,7 +68,7 @@
               <span>内部编码</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item prop="">
+              <el-form-item>
                 <span>{{ formobj.insideCode }}</span>
               </el-form-item>
             </el-col>
@@ -77,13 +76,13 @@
               <span><span class="icon">*</span>销售指导价</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item prop="guidedPrice">{{ formobj.guidedPrice }}</el-form-item>
+              <el-form-item>{{ formobj.guidedPrice }}</el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
               <span><span class="icon">*</span>厂家合同价</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item prop="manufactorSettlementPrice">
+              <el-form-item>
                 <el-input v-model="formobj.manufactorSettlementPrice" class="addinputw" clearable></el-input>
               </el-form-item>
             </el-col>
@@ -94,7 +93,9 @@
             </el-col>
             <el-col :span="13">
               <el-form-item prop="purchasingUnitName">
-                <el-input v-model="formobj.purchasingUnitName" placeholder="采购单位" class="addinputw" clearable/>
+                <el-select v-model="formobj.purchasingUnitName" filterable placeholder="请选择" @change="changeWcgys">
+                  <el-option v-for="item in wcgys_list" :key="item.sid" :label="item.manufacturerName" :value="item.manufacturerName"></el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
@@ -102,8 +103,8 @@
             </el-col>
             <el-col :span="5">
               <el-form-item prop="isBeforePayment">
-                <el-radio v-model="formobj.isBeforePayment" @change="changeRadio" label="0">否</el-radio>
                 <el-radio v-model="formobj.isBeforePayment" @change="changeRadio" label="1">是</el-radio>
+                <el-radio v-model="formobj.isBeforePayment" label="0">否</el-radio>
               </el-form-item>
             </el-col>
           </el-row>
@@ -140,7 +141,9 @@
             </el-col>
             <el-col :span="5">
               <el-form-item prop="accountName">
-                <el-input v-model="formobj.accountName" placeholder="" class="addinputw" clearable/>
+                <el-select v-model="formobj.accountName" filterable placeholder="请选择" @change="changeAccountName">
+                  <el-option v-for="item in account_list" :key="item.bankAccount" :label="item.accountName" :value="item.accountName"></el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
@@ -148,7 +151,7 @@
             </el-col>
             <el-col :span="5">
               <el-form-item>
-                <el-input v-model="formobj.depositBankName" placeholder="" class="addinputw" clearable/>
+                <span>{{ formobj.depositBankName }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
@@ -156,7 +159,7 @@
             </el-col>
             <el-col :span="5">
               <el-form-item>
-                <el-input v-model="formobj.bankAccount" placeholder="" class="addinputw" clearable/>
+                <span>{{ formobj.bankAccount }}</span>
               </el-form-item>
             </el-col>
           </el-row>
@@ -166,7 +169,9 @@
             </el-col>
             <el-col :span="5">
               <el-form-item>
-                <el-input v-model="formobj.modelAccountName" placeholder="" class="addinputw" clearable/>
+                <el-select v-model="formobj.modelAccountName" filterable placeholder="请选择" @change="changeModelAccountName">
+                  <el-option v-for="item in account_list" :key="item.bankAccount" :label="item.accountName" :value="item.accountName"></el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
@@ -174,7 +179,7 @@
             </el-col>
             <el-col :span="5">
               <el-form-item>
-                <el-input v-model="formobj.modelBankName" placeholder="" class="addinputw" clearable/>
+                <span>{{ formobj.modelBankName }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
@@ -182,7 +187,7 @@
             </el-col>
             <el-col :span="5">
               <el-form-item>
-                <el-input v-model="formobj.modelBankAccount" placeholder="" class="addinputw" clearable/>
+                <span>{{ formobj.modelBankAccount }}</span>
               </el-form-item>
             </el-col>
           </el-row>
@@ -191,7 +196,7 @@
               <span>其他费用名称</span>
             </el-col>
             <el-col :span="13">
-              <el-form-item prop="expenseName">
+              <el-form-item>
                 <el-input v-model="formobj.expenseName" placeholder="" class="addinputw" clearable/>
               </el-form-item>
             </el-col>
@@ -199,7 +204,7 @@
               <span>费用合计</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item prop="totalExpenseAmount">
+              <el-form-item>
                 <el-input v-model="formobj.totalExpenseAmount" placeholder="" class="addinputw" clearable/>
               </el-form-item>
             </el-col>
@@ -209,7 +214,7 @@
               <span>备注</span>
             </el-col>
             <el-col :span="21">
-              <el-form-item prop="remarks">
+              <el-form-item>
                 <el-input v-model="formobj.remarks" placeholder="" class="addinputw" clearable/>
               </el-form-item>
             </el-col>
@@ -265,13 +270,15 @@
 
 import modellibrary from '@/views/baseoutsourcingapplication/relation/modellibrary'
 import req from '@/api/baseoutsourcingapplication/baseoutsourcingapplication'
-import configuration from '@/views/baseoutsourcingapplication/chexingbyconfiguration'
+import configuration from './chexingbyconfiguration'
 import { getStorage } from '@/utils/auth'
+import { getPathSidByUserSid } from '@/api/cheliang/basevehiclemodel'
 
 export default {
   name: 'BaseOutsourcingApplicationAdd',
   components: {
-    modellibrary, configuration
+    modellibrary,
+    configuration
   },
   data() {
     return {
@@ -291,6 +298,8 @@ export default {
       uploadAction: process.env.VUE_APP_BASE_API + '/base/file/upload',
       filType: '.pdf,.docx',
       fileList: [],
+      wcgys_list: [],
+      account_list: [],
       formobj: {
         remarks: '',
         useOrgName: '',
@@ -303,11 +312,12 @@ export default {
         insideCode: '',
         staffSid: window.sessionStorage.getItem('staffSid'),
         applicationCode: '', // 申请编号
-        createByName: window.sessionStorage.getItem('name'), // 申请人姓名
+        createByName: '', // 申请人姓名
         applicationDate: '', // 申请日期
         externalMiningTypeKey: '1', // 外采类型key
         externalMiningTypeValue: '', // 外采类型value
         purchasingUnitName: '', // 采购单位名称
+        purchasingUnitSid: '',
         modelSid: '', // 车型sid
         modelName: '', // 车型名称
         configName: '', // 常用配置名称
@@ -323,7 +333,6 @@ export default {
         baseOutsourcingApplicationVehicleDtos: [],
         taskId: '',
         businessSid: '',
-        comment: '',
         instanceId: '',
         modelId: ''
       },
@@ -336,24 +345,11 @@ export default {
       },
       obj: {},
       rules: {
-        createByName: [{ required: true, message: '申请人姓名不能为空', trigger: 'blur' }], // 申请人姓名
-        externalMiningTypeKey: [{ required: true, message: '外采类型key不能为空', trigger: 'blur' }], // 外采类型key
-        externalMiningTypeValue: [{ required: true, message: '外采类型value不能为空', trigger: 'blur' }], // 外采类型value
-        purchasingUnitName: [{ required: true, message: '采购单位不能为空', trigger: 'blur' }], // 采购单位名称
-        depositBankName: [{ required: true, message: '车款开户银行不能为空', trigger: 'blur' }], // 采购单位名称
-        bankAccount: [{ required: true, message: '车款银行账号不能为空', trigger: 'blur' }], // 采购单位名称
-        modelBankName: [{ required: true, message: '订金开户银行不能为空', trigger: 'blur' }], // 采购单位名称
-        modelBankAccount: [{ required: true, message: '订金银行账号不能为空', trigger: 'blur' }], // 采购单位名称
-        modelSid: [{ required: true, message: '车型不能为空', trigger: 'blur' }], // 车型sid
-        configSid: [{ required: true, message: '常用配置不能为空', trigger: 'blur' }], // 常用配置名称
+        purchasingUnitName: [{ required: true, message: '外采供应商不能为空', trigger: 'change' }], // 采购单位名称
+        accountName: [{ required: true, message: '车款账户不能为空', trigger: 'blur' }], // 车款账户
         purchasePrice: [{ required: true, message: '采购价格不能为空', trigger: 'blur' }], // 采购价格
-        // guidedPrice: [{ required: true, message: '销售指导价不能为空', trigger: 'blur' }], // 销售指导价
-        manufactorSettlementPrice: [{ required: true, message: '厂家合同价不能为空', trigger: 'blur' }], // 厂家合同价
         num: [{ required: true, message: '台数不能为空', trigger: 'blur' }], // 台数
-        deposit: [{ required: true, message: '订金不能为空', trigger: 'blur' }], // 订金
-        // expenseName: [{ required: true, message: '费用名称不能为空', trigger: 'blur' }], // 费用名称
-        // totalExpenseAmount: [{ required: true, message: '费用金额合计不能为空', trigger: 'blur' }], // 费用金额合计
-        orgSid: [{ required: true, message: '部门sid不能为空', trigger: 'blur' }] // 部门sid
+        deposit: [{ required: true, message: '订金不能为空', trigger: 'blur' }] // 订金
       }
     }
   },
@@ -388,6 +384,22 @@ export default {
     }, '*')
   },
   methods: {
+    init() {
+      getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
+        if (res.success) {
+          req.fetchOrgBySid(res.data).then((resp) => {
+            if (resp.success) {
+              this.formobj.useOrgName = resp.data.name
+            }
+          })
+          req.wcgysNamesDown(res.data).then((response) => {
+            if (response.success) {
+              this.wcgys_list = response.data
+            }
+          })
+        }
+      })
+    },
     // 删除附件
     handleRemoveAttachment(file, files) {
       this.fileList = this.fileList.filter(item => item.uid !== file.uid)
@@ -431,7 +443,6 @@ export default {
       this.formobj.configSid = info[0].configSid // 常用配置sid
       this.formobj.guidedPrice = info[0].guidedPrice// 销售指导价
       this.formobj.insideCode = info[0].insideCode// 内部编码
-      // this.formobj.manufactorSettlementPrice = info[0].manufactorSettlementPrice// 厂家合同价
     },
     handleSubmit() {
       // var contract = this.formobj.contract
@@ -443,62 +454,37 @@ export default {
         this.$message({ showClose: true, type: 'success', message: '请检查是否先付款已选择' })
         return
       }
+      if (this.formobj.modelName === '' || this.formobj.modelName === null) {
+        this.$message({ showClose: true, type: 'error', message: '车型不能为空,请选择车型' })
+        return
+      }
       // 提交的代码
       this.submitdisabled = true
       this.formobj.userSid = window.sessionStorage.getItem('userSid')
       this.formobj.orgSid = this.$store.getters.orgSid
-      req.doSubmit(this.formobj).then(resp => {
-        this.submitdisabled = false
-        if (resp.success) {
-          window.parent.postMessage({
-            cmd: 'returnHeight',
-            params: {
-              // 告诉父级页面，子页面的弹框高度。
-              code: 1
+      this.$refs['form_obj'].validate(valid => {
+        if (valid) {
+          req.doSubmit(this.formobj).then(resp => {
+            this.submitdisabled = false
+            if (resp.success) {
+              window.parent.postMessage({
+                cmd: 'returnHeight',
+                params: {
+                  // 告诉父级页面，子页面的弹框高度。
+                  code: 1
+                }
+              }, '*')
+            } else {
+              // 根据resp.code进行异常情况处理
             }
-          }, '*')
-        } else {
-          // 根据resp.code进行异常情况处理
+          }).catch(() => {
+            this.submitdisabled = false
+          })
         }
-      }).catch(() => {
-        this.submitdisabled = false
       })
     },
-    quedingVehicle() {
-      var obj = this.$refs['vehicle'].getSids()
-      var length = obj.length
-
-      if (length < 1) {
-        alert('必须选择一条数据!')
-        return
-      }
-      this.formobj.num = length
-      this.formobj.baseOutsourcingApplicationVehicleDtos = obj
-      this.vehicleDialogVisible = false
-    },
-    queding(dialog) {
-      var obj = this.$refs['modellibrary'].getConfigDataList()
-      var length = obj.configs.length
-      if (length > 1) {
-        alert('只能选择一条数据!')
-        return
-      } else if (length < 1) {
-        alert('必须选择一条数据!')
-        return
-      }
-      this.formobj.modelName = obj.model.vehicleAlias
-      this.formobj.modelSid = obj.model.sid
-      this.formobj.configName = obj.configs[0].configName
-      this.formobj.configSid = obj.configs[0].sid
-      this.formobj.guidedPrice = obj.configs[0].guidedPrice // 销售指导价
-      this.formobj.manufactorSettlementPrice = 1 // obj.configs[0].manufactorSettlementPrice // 厂家合同价
-      this.formobj.baseOutsourcingApplicationVehicleDtos = []
-      this.formobj.num = 0
-      this.dialogVisible = false
-    },
     resetState() {
       this.viewState = 1
-      this.handReset()
     },
     selectModel() {
       this.viewState = 2
@@ -551,8 +537,9 @@ export default {
     showEdit(sid) {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
+        this.init()
       })
-      this.viewTitle = '【修改】外采申请表'
+      this.viewTitle = '【编辑】外采申请表'
       this.formobj.sid = sid // SID
       req.fetchBySid(sid).then(resp => {
         if (resp.success) {
@@ -565,7 +552,6 @@ export default {
             })
           }
           this.formobj.contract = vdata.contract
-          /* _this.fileList[0] = vdata.contract*/
           this.formobj.taskId = vdata.taskId
           this.formobj.insideCode = vdata.insideCode
           this.formobj.instanceId = vdata.procInstSid
@@ -585,6 +571,7 @@ export default {
           this.formobj.externalMiningTypeKey = vdata.externalMiningTypeKey // 外采类型key
           this.formobj.externalMiningTypeValue = vdata.externalMiningTypeValue // 外采类型value
           this.formobj.purchasingUnitName = vdata.purchasingUnitName // 采购单位名称
+          this.formobj.purchasingUnitSid = vdata.purchasingUnitSid
           this.formobj.modelSid = vdata.modelSid // 车型sid
           this.formobj.modelName = vdata.modelName // 车型名称
           this.formobj.configName = vdata.configName // 常用配置名称
@@ -597,6 +584,7 @@ export default {
           this.formobj.expenseName = vdata.expenseName // 费用名称
           this.formobj.totalExpenseAmount = vdata.totalExpenseAmount // 费用金额合计
           this.formobj.orgSid = vdata.orgSid // 部门sid
+          this.formobj.useOrgSid = vdata.useOrgSid
           this.formobj.baseOutsourcingApplicationVehicleDtos = vdata.baseOutsourcingApplicationVehicleVos // 部门sid
         } else {
           // 根据resp.code进行异常情况处理
@@ -605,24 +593,68 @@ export default {
         this.formobj = {}
       })
     },
-    changeRadio(val) {
-      if (val == 0) {
-        this.formobj.accountName = this.formobj.purchasingUnitName
-      } else if (val == 1) {
-        this.formobj.modelAccountName = ''
-        this.formobj.modelBankName = ''
-        this.formobj.modelBankAccount = ''
-        this.formobj.accountName = this.formobj.purchasingUnitName
-        this.formobj.deposit = 0
-      }
+    changeWcgys(value) {
+      let bb = null
+      this.wcgys_list.forEach((e) => {
+        if (e.manufacturerName === value) {
+          bb = {
+            sid: e.sid,
+            name: e.manufacturerName
+          }
+        }
+      })
+      this.formobj.purchasingUnitSid = bb.sid
+      this.formobj.accountName = ''
+      this.formobj.depositBankName = ''
+      this.formobj.bankAccount = ''
+      this.formobj.modelAccountName = ''
+      this.formobj.modelBankName = ''
+      this.formobj.modelBankAccount = ''
+      req.bankNamesDown(bb.sid).then((ress) => {
+        if (ress.success) {
+          this.account_list = ress.data
+        }
+      })
     },
-    handleClose() {
-      this.vehicleDialogVisible = false
-      this.dialogVisible = false
+    changeAccountName(value) {
+      let bb = null
+      this.account_list.forEach((e) => {
+        if (e.accountName === value) {
+          bb = {
+            bankAccount: e.bankAccount,
+            depositBank: e.depositBank
+          }
+        }
+      })
+      this.formobj.depositBankName = bb.depositBank
+      this.formobj.bankAccount = bb.bankAccount
+    },
+    changeModelAccountName(value) {
+      let bb = null
+      this.account_list.forEach((e) => {
+        if (e.accountName === value) {
+          bb = {
+            bankAccount: e.bankAccount,
+            depositBank: e.depositBank
+          }
+        }
+      })
+      this.formobj.modelBankName = bb.depositBank
+      this.formobj.modelBankAccount = bb.bankAccount
+    },
+    changeRadio() {
+      this.formobj.modelAccountName = ''
+      this.formobj.modelBankName = ''
+      this.formobj.modelBankAccount = ''
+      this.formobj.deposit = 0
     },
     saveOrUpdate() {
       this.formobj.userSid = window.sessionStorage.getItem('userSid')
       this.formobj.orgSid = this.$store.getters.orgSid
+      if (this.formobj.modelName === '' || this.formobj.modelName === null) {
+        this.$message({ showClose: true, type: 'error', message: '车型不能为空,请选择车型' })
+        return
+      }
       this.$refs['form_obj'].validate(valid => {
         if (valid) {
           this.submitdisabled = true
diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/chexingbyconfiguration.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/chexingbyconfiguration.vue
new file mode 100644
index 0000000000..7393203e7e
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/chexingbyconfiguration.vue
@@ -0,0 +1,209 @@
+<template>
+  <div class="app-container">
+    <div>
+      <div class="tab-header webtop">
+        <div>车型常用列表</div>
+        <div>
+          <el-button type="primary" size="small" @click="AddUpdateReturn">确定</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <div class="">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header" label-width="100px">
+              <el-form-item label="车型:">
+                <el-input v-model="listQuery.params.vehicleAlias" placeholder="" clearable class="filter-item"/>
+              </el-form-item>
+              <el-form-item label="常用配置:">
+                <el-input v-model="listQuery.params.configName" placeholder="" clearable class="filter-item"/>
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center">
+              <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
+              <el-button type="primary" icon="el-icon-refresh"  size="small" @click="handresetting">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <div class="">
+          <el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
+            <el-table-column width="50px" type="selection" align="center"/>
+            <el-table-column width="80px" label="编号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column label="车型" align="center" width="250">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vehicleAlias }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="常用配置" header-align="center" align="left">
+              <template slot-scope="scope">
+                <span>{{ scope.row.configName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="销售指导价(元)" width="200" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.guidedPrice }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <div class="pages">
+          <div class="tit"/>
+          <!-- 翻页 -->
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/pagination'
+import req from '@/api/kucunguanli/price'
+import { getPathSidByUserSid } from '@/api/cheliang/basevehiclemodel'
+
+export default {
+  name: "chexingbyconfiguration",
+  components: {
+    Pagination
+  },
+  data() {
+    return {
+      isSearchShow: false,
+      searchxianshitit: '隐藏查询条件',
+      tableKey: 0,
+      showbackState: 30,
+      sids: [],
+      list: [],
+      number: '',
+      listLoading: false,
+      userOrgSid: '',
+      listQuery: {
+        current: 1,
+        size: 10,
+        params: {
+          vehicleAlias: '',
+          configName: '',
+          useOrgSid: '',
+          vehicleStateValue: '',
+          sidList: []
+        },
+        total: 1
+      }
+    }
+  },
+  methods: {
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    // 返回
+    handleReturn() {
+      this.$emit('doback')
+    },
+    getPathSid() {
+      const userSid = window.sessionStorage.getItem('userSid')
+      getPathSidByUserSid({userSid:userSid}).then((res) => {
+        if (res.code === '200') {
+          this.listQuery.params.useOrgSid = res.data
+          this.getList()
+        }
+      })
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      req.configurationlistPage(this.listQuery).then((response) => {
+        this.listLoading = false
+        if (response.success) {
+          this.listQuery.total = response.data.total
+          this.list = response.data.records
+        }
+      })
+    },
+    // 查询按钮
+    handleFilter() {
+      this.getPathSid()
+    },
+    // 重置按钮
+    handresetting() {
+      this.listQuery = {
+        current: 1,
+        size: 10,
+        params: {
+          vehicleAlias: '',
+          configName: '',
+          useOrgSid: '',
+          vehicleStateValue: '',
+          sidList: []
+        },
+        total: 1
+      }
+      this.getPathSid()
+    },
+    handleSelectionChange(row) {
+      this.sids = []
+      const aa = []
+      row.forEach((element) => {
+        aa.push({
+          vehicleAlias: element.vehicleAlias,
+          modelSid: element.modelSid,
+          configName: element.configName,
+          configSid: element.configSid,
+          guidedPrice: element.guidedPrice,
+          manufactorSettlementPrice: element.manufactorSettlementPrice,
+          insideCode:element.insideCode
+        })
+      })
+      this.sids = aa
+    },
+    showData(value) {
+      const aa = []
+      if (value.length > 0) {
+        for (var i = 0; i < value.length; i++) {
+          aa.push({
+            modelSid: value[i].vehicleSid,
+            configSid: value[i].configSid
+          })
+        }
+        this.listQuery.params.sidList = aa
+      } else {
+        this.listQuery.params.sidList = []
+      }
+      this.getPathSid()
+    },
+    // 添加修改返回
+    AddUpdateReturn() {
+      if (this.sids.length > 1) {
+        this.$notify({
+          title: '提示',
+          message: '只能选择一条记录',
+          type: 'error',
+          duration: 2000
+        })
+      } else if (this.sids.length === 1) {
+        this.$emit('backData', this.sids)
+      } else {
+        this.$notify({
+          title: '提示',
+          message: '请选择至少一条车型记录!',
+          type: 'error',
+          duration: 2000
+        })
+      }
+    }
+  }
+}
+</script>
+<style scoped>
+</style>