From 419c8301375049bebce7f729a586c28ae7c724ba Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Sat, 27 Aug 2022 17:04:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BD=A6=E8=BE=86=E5=A4=96?=
 =?UTF-8?q?=E9=87=87=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../baseoutsourcingapplicationAdd.vue         | 195 ++++--------------
 .../baseoutsourcingapplicationInfo.vue        | 109 +++-------
 .../workflow/baseoutsourcingapplication.vue   |  60 +++---
 .../baseoutsourcingapplicationAdd.vue         |  83 +++-----
 .../baseoutsourcingapplicationInfo.vue        |  50 ++---
 5 files changed, 139 insertions(+), 358 deletions(-)

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 c5a893adaf..262d7b2036 100644
--- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue
@@ -1,21 +1,14 @@
 <template>
   <div class="app-container">
     <div v-show="viewState == 1">
-      <!-- 标题按钮部分开始 -->
       <div class="tab-header webtop">
-        <!-- 标题 -->
         <div>{{ viewTitle }}</div>
-        <!-- start 添加修改按钮 -->
         <div>
           <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
           <el-button type="primary" size="small" :disabled="submitdisabled" @click="doSubmit">提交</el-button>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
-        <!-- end 添加修改按钮 -->
-        <!-- end 详情按钮 -->
       </div>
-      <!-- 标题按钮部分结束 -->
-      <!-- Start 新增修改部分 -->
       <div class="listconadd">
         <div class="titwu">外采申请表</div>
         <el-form ref="form_obj" :model="formobj" :rules="rules" label-position="right" class="formadd">
@@ -24,19 +17,19 @@
             <el-col :span="3" class="tleftb">
               <span>分公司名称</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item prop="applicationCode">{{ formobj.useOrgName }}</el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
               <span>申请人</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item prop="createByName">{{ formobj.createByName }}</el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
               <span>申请日期</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item prop="applicationDate">{{ formobj.applicationDate }}</el-form-item>
             </el-col>
           </el-row>
@@ -44,27 +37,19 @@
               <el-col :span="3" class="tleftb">
                 <span><span class="icon">*</span>外采类型</span>
               </el-col>
-              <el-col :span="21" class="trightb" >
+              <el-col :span="21" >
                 <el-radio v-model="formobj.externalMiningTypeKey"  label="1">直接外采</el-radio>
                 <el-radio v-model="formobj.externalMiningTypeKey"  label="2">政策外采</el-radio>
               </el-col>
             </el-row>-->
-          <!--<el-row style="border-left: none; ">
-            <el-col :span="3" class="tleftb">
-              <span><span class="icon">*</span>采购单位</span>
-            </el-col>
-            <el-col :span="21" class="trightb">
-              <el-form-item prop="purchasingUnitName"><el-input v-model="formobj.purchasingUnitName" placeholder="采购单位" class="addinputw" clearable /></el-form-item>
-            </el-col>
-          </el-row>-->
           <el-row>
             <el-col :span="3" class="tleftb">
               <span><span class="icon">*</span>车型</span>
             </el-col>
-            <el-col :span="19" class="trightb">
+            <el-col :span="19">
               <el-form-item prop="modelName">{{ formobj.modelName }}</el-form-item>
             </el-col>
-            <el-col :span="2" class="trightb">
+            <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>
@@ -83,7 +68,7 @@
             <el-col :span="3" class="tleftb">
               <span>内部编码</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item prop="">
                 <span>{{ formobj.insideCode }}</span>
               </el-form-item>
@@ -91,13 +76,13 @@
             <el-col :span="3" class="tleftb">
               <span>销售指导价</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item prop="guidedPrice">{{ formobj.guidedPrice }}</el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
               <span>厂家合同价</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item prop="manufactorSettlementPrice">
                 <el-input v-model="formobj.manufactorSettlementPrice" class="addinputw" clearable></el-input>
               </el-form-item>
@@ -109,13 +94,13 @@
             </el-col>
             <el-col :span="13">
               <el-form-item prop="purchasingUnitName">
-                <el-input v-model="formobj.purchasingUnitName" placeholder="采购单位" class="addinputw" clearable/>
+                <el-input v-model="formobj.purchasingUnitName" placeholder="" class="addinputw" clearable/>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
               <span><span class="icon">*</span>是否先付车款</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <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>
@@ -126,26 +111,26 @@
             <el-col :span="3" class="tleftb">
               <span><span class="icon">*</span>采购价格</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item prop="purchasePrice">
-                <el-input v-model="formobj.purchasePrice" placeholder="采购价格" class="addinputw" clearable/>
+                <el-input v-model="formobj.purchasePrice" placeholder="" class="addinputw" clearable/>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
               <span><span class="icon">*</span>台数</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item v-show="formobj.externalMiningTypeKey==1" prop="num">
-                <el-input v-model="formobj.num" placeholder="台数" class="addinputw" clearable/>
+                <el-input v-model="formobj.num" placeholder="" class="addinputw" clearable/>
               </el-form-item>
               <el-form-item v-show="formobj.externalMiningTypeKey==2" prop="num">{{ formobj.num }}</el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
               <span><span class="icon">*</span>订金</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item prop="deposit">
-                <el-input style="height:10px;" :disabled="formobj.isBeforePayment === '1'" v-model="formobj.deposit" placeholder="订金" class="addinputw" clearable/>
+                <el-input style="height:10px;" :disabled="formobj.isBeforePayment === '1'" v-model="formobj.deposit" placeholder="" class="addinputw" clearable/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -153,7 +138,7 @@
             <el-col :span="3" class="tleftb">
               <span><span class="icon">*</span>车款账户名称</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item prop="accountName">
                 <el-input v-model="formobj.accountName" placeholder="" class="addinputw" clearable/>
               </el-form-item>
@@ -161,7 +146,7 @@
             <el-col :span="3" class="tleftb">
               <span>开户行</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item>
                 <el-input v-model="formobj.depositBankName" placeholder="" class="addinputw" clearable/>
               </el-form-item>
@@ -169,7 +154,7 @@
             <el-col :span="3" class="tleftb">
               <span>银行账号</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item>
                 <el-input v-model="formobj.bankAccount" placeholder="" class="addinputw" clearable/>
               </el-form-item>
@@ -179,7 +164,7 @@
             <el-col :span="3" class="tleftb">
               <span>订金账户名称</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item>
                 <el-input v-model="formobj.modelAccountName" placeholder="" class="addinputw" clearable/>
               </el-form-item>
@@ -187,7 +172,7 @@
             <el-col :span="3" class="tleftb">
               <span>开户行</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item>
                 <el-input size="small" v-model="formobj.modelBankName" placeholder="" class="addinputw" clearable/>
               </el-form-item>
@@ -195,7 +180,7 @@
             <el-col :span="3" class="tleftb">
               <span>银行账号</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item>
                 <el-input v-model="formobj.modelBankAccount" placeholder="" class="addinputw" clearable/>
               </el-form-item>
@@ -205,17 +190,17 @@
             <el-col :span="3" class="tleftb">
               <span>其他费用名称</span>
             </el-col>
-            <el-col :span="13" class="trightb">
+            <el-col :span="13">
               <el-form-item prop="expenseName">
-                <el-input v-model="formobj.expenseName" placeholder="费用名称" class="addinputw" clearable/>
+                <el-input v-model="formobj.expenseName" placeholder="" class="addinputw" clearable/>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
               <span>其他费用合计</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item prop="totalExpenseAmount">
-                <el-input v-model="formobj.totalExpenseAmount" placeholder="费用金额合计" class="addinputw" clearable/>
+                <el-input v-model="formobj.totalExpenseAmount" placeholder="" class="addinputw" clearable/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -223,9 +208,9 @@
             <el-col :span="3" class="tleftb">
               <span>备注</span>
             </el-col>
-            <el-col :span="21" class="trightb">
+            <el-col :span="21">
               <el-form-item prop="remarks">
-                <el-input v-model="formobj.remarks" placeholder="备注" class="addinputw" clearable/>
+                <el-input v-model="formobj.remarks" placeholder="" class="addinputw" clearable/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -269,47 +254,11 @@
           </div>
         </el-form>
       </div>
-    </div><!-- End 添加修改部分 -->
-    <!-- 选择待办人 -->
-    <!-- <modellibrary @doback="resetState" v-show="viewState == 1.2" ref="chexingxuanze" @handleChexing="selectChexing"></modellibrary>
- -->
-
-    <el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
-      <el-form label-position="right" class="formadd">
-        <el-row>
-          <el-col :span="4" class="tleftb">当前环节</el-col>
-          <el-col :span="20" class="trightb">
-            <!--当前环节指向下一环节-->
-            <el-form-item prop="purchasingUnitName"><span>{{ firstNode.name }}->{{ nextNode.name }}</span>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <div style="text-align:center;margin-top: 20px;">
-          <el-button type="primary" size="mini" @click="agree">确 定</el-button>
-          <el-button type="info " size="mini" @click="closeNodeDialog">取 消</el-button>
-        </div>
-      </el-form>
-    </el-dialog>
-    <!-- 选择用户 的弹出框-->
-    <el-dialog title="选择用户" :visible.sync="nodeUserDialogVisible" width="80%">
-      <el-form label-position="right" class="formadd">
-        <div v-for="item in users">
-          <el-row>
-            <el-col :span="24" class="tleftb" style="text-align: left">{{ item.dept }}</el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24" class="trightb">
-              <el-radio-group v-model="userSid">
-                <el-radio v-for="item in item.users" :key="item.sid" :label="item.sid" @change="checkedUser(item)">{{ item.name }}
-                </el-radio>
-              </el-radio-group>
-            </el-col>
-          </el-row>
-        </div>
-      </el-form>
-    </el-dialog>
+    </div>
+    <!-- End 添加修改部分 -->
+    <!-- <modellibrary @doback="resetState" v-show="viewState == 1.2" ref="chexingxuanze" @handleChexing="selectChexing"></modellibrary>-->
     <!--选择车型和常用配置-->
-    <configuration v-show="viewState == 1.2" ref="divconfiguration" @backData="selectChexing" @doback="closePage"/>
+    <configuration v-show="viewState == 2" ref="divconfiguration" @backData="selectChexing" @doback="closePage"/>
   </div>
 </template>
 <script>
@@ -330,18 +279,8 @@ export default {
       accessToken: {
         token: getStorage()
       },
-      // 第一个环节
-      firstNode: {},
-      // 下一个环节
-      nextNode: {},
-      // 角色sid
-      roleSid: '',
-      // 可选择的下一环节的用户集合
-      users: [],
       // 点击提交按钮显示弹框
       nodeDialogVisible: false,
-      // 选择用户弹框
-      nodeUserDialogVisible: false,
       selectedSids: '',
       vehicleDialogVisible: false,
       dialogVisible: false,
@@ -401,7 +340,7 @@ export default {
         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: 'blur' }], // 采购单位名称
         accountName: [{ required: true, message: '车款账户不能为空', trigger: 'blur' }], // 车款账户
         depositBankName: [{ required: true, message: '车款开户银行不能为空', trigger: 'blur' }], // 采购单位名称
         bankAccount: [{ required: true, message: '车款银行账号不能为空', trigger: 'blur' }], // 采购单位名称
@@ -452,8 +391,7 @@ export default {
     getPathSid() {
       const userSid = window.sessionStorage.getItem('userSid')
       getPathSidByUserSid({ userSid: userSid }).then((res) => {
-        if (res.code === '200') {
-          // this.listQuery.params.createOrgSId = res.data
+        if (res.success) {
           req.fetchOrgBySid(res.data).then((ress) => {
             this.formobj.useOrgName = ress.data.name
           })
@@ -467,9 +405,6 @@ export default {
         fileSize: file.response.data.size
       }
     },
-    closeNodeDialog() {
-      this.nodeDialogVisible = false
-    },
     quedingVehicle() {
       var obj = this.$refs['cheliang'].getSids()
       var length = obj.length
@@ -484,13 +419,10 @@ export default {
     },
     resetState() {
       this.viewState = 1
-      this.handReset()
     },
     selectModel() {
-      this.viewState = '1.2'
-      // this.viewState = 2
+      this.viewState = 2
       this.$refs['divconfiguration'].showData(this.formobj.baseOutsourcingApplicationVehicleDtos)
-      // this.$refs['chexingxuanze'].showChexing()
     },
     selectChexing(info) {
       this.viewState = '1'
@@ -583,12 +515,6 @@ export default {
                 url: vdata.contract.filePath
               })
             }
-            /*
-              this.formobj.contract={
-              sourceFileName : vdata.contract.fileName ,
-              filePath: vdata.contract.filePath,
-              fileSize: vdata.contract.fileSize
-            }*/
             this.formobj.contract = vdata.contract
             this.formobj.accountName = vdata.accountName
             this.formobj.remarks = vdata.remarks
@@ -626,8 +552,7 @@ export default {
           } else {
             // 根据resp.code进行异常情况处理
           }
-        })
-        .catch(e => {
+        }).catch(e => {
           console.log(e)
         })
     },
@@ -646,25 +571,6 @@ export default {
       this.vehicleDialogVisible = false
       this.dialogVisible = false
     },
-    indexMethod(index) {
-      /*     var pagestart=(this.queryParams.current-1) * this.queryParams.size;
-           var pageindex=index+1+pagestart;
-           return pageindex;*/
-    },
-    // 打开选择用户的弹框，并且根据角色查询用户列表
-    /* selectUser() {
-       this.nodeUserDialogVisible = true;
-       req.getUsers( this.roleSid ).then(res => {
-         this.users = res.data
-       })
-     },*/
-    // 选择下一环节的用户
-    /* checkedUser(val) {
-
-       this.userName = val.name
-       this.formobj.nextUserSid =val.sid
-       this.nodeUserDialogVisible = false
-     },*/
     doSubmit() {
       // var contract = this.formobj.contract
       // if (contract.fileName === '' || contract.fileName === null || contract.fileName === undefined) {
@@ -680,28 +586,6 @@ export default {
       this.formobj.userSid = window.sessionStorage.getItem('userSid')
       this.formobj.orgSid = this.$store.getters.orgSid
       // 查验下一环节要用到，流程定义的id
-
-      this.agree()
-      // req.getNextNodesForSubmit(this.formobj).then(resp=>{
-      //   if (resp.success) {
-      //     //第一个环节
-      //     this.firstNode=resp.data[0];
-      //     //下一环节
-      //     this.nextNode=resp.data[1];
-      //     //环节上配置的角色
-      //     var candidateGroups=this.nextNode.candidateGroups;
-      //     this.roleSid=candidateGroups[0];
-      //     req.getNextUserSids( this.formobj.orgSid,this.roleSid ).then(res => {
-      //       /!*this.users = res.data*!/
-      //       this.formobj.nextUserSid =res.data
-      //     })
-      //   //  this.nodeDialogVisible = true
-      //   }
-      //   this.submitdisabled = false
-      // })
-    },
-    // 选择用户后点击确定/同意时向后台传递数据，启动流程，并从第一个环节流转到下一个环节
-    agree() {
       req.doSubmit(this.formobj).then(resp => {
         this.submitdisabled = false
         if (resp.success) {
@@ -716,7 +600,6 @@ export default {
       })
     },
     saveOrUpdate() {
-      const _this = this
       this.formobj.userSid = window.sessionStorage.getItem('userSid')
       this.formobj.orgSid = this.$store.getters.orgSid
       if (this.formobj.externalMiningTypeKey == '1') {
@@ -730,8 +613,8 @@ export default {
           req.saveOrUpdate(this.formobj).then(resp => {
             this.submitdisabled = false
             if (resp.success) {
-              _this.$message({ showClose: true, type: 'success', message: resp.msg })
-              _this.handleReturn('true')
+              this.$message({ showClose: true, type: 'success', message: resp.msg })
+              this.handleReturn('true')
             } else {
               // 根据resp.code进行异常情况处理
             }
diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationInfo.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationInfo.vue
index 07a54e85e9..d2ab1e2ad6 100644
--- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationInfo.vue
@@ -17,26 +17,22 @@
         <div class="wlInfo" style="text-align: right;"><span style="font-size:14px;">金额单位：元</span></div>
         <el-row style="border-top: 1px solid #e0e3eb">
           <el-col :span="3" class="tleftb">分公司名称</el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item>
               <span>{{ formobj.useOrgName }}</span></el-form-item>
           </el-col>
           <el-col :span="3" class="tleftb">申请人姓名</el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item><span>{{ formobj.createByName }}</span></el-form-item>
           </el-col>
           <el-col :span="3" class="tleftb">申请日期</el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item><span>{{ formobj.applicationDate }}</span></el-form-item>
           </el-col>
         </el-row>
-        <!--	<el-row>
-            <el-col :span="3" class="tleftb">采购单位名称</el-col>
-            <el-col :span="21" class="trightb"><el-form-item><span>{{ formobj.purchasingUnitName }}</span></el-form-item></el-col>
-          </el-row>-->
         <el-row>
           <el-col :span="3" class="tleftb">车型名称</el-col>
-          <el-col :span="21" class="trightb">
+          <el-col :span="21">
             <el-form-item><span>{{ formobj.modelName }}</span></el-form-item>
           </el-col>
         </el-row>
@@ -50,28 +46,28 @@
           <el-col :span="3" class="tleftb">
             <span>内部编码</span>
           </el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item>
               <span>{{ formobj.insideCode }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="3" class="tleftb">销售指导价</el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item><span>{{ formobj.guidedPrice }}</span></el-form-item>
           </el-col>
           <el-col :span="3" class="tleftb">厂家合同价</el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item><span>{{ formobj.manufactorSettlementPrice }}</span></el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="3" class="tleftb">外采供应商</el-col>
-          <el-col :span="13" class="trightb">
+          <el-col :span="13">
             <el-form-item>
               <span>{{ formobj.purchasingUnitName }}</span></el-form-item>
           </el-col>
           <el-col :span="3" class="tleftb">是否先付车款</el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item><span>{{ formobj.isBeforePayment === '1' ? '是' : '否' }}</span></el-form-item>
           </el-col>
         </el-row>
@@ -79,14 +75,14 @@
           <el-col :span="3" class="tleftb">
             <span>采购价格</span>
           </el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item>
               <span>{{ formobj.purchasePrice }}</span></el-form-item>
           </el-col>
           <el-col :span="3" class="tleftb">
             <span>台数</span>
           </el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item>
               <span>{{ formobj.num }}</span>
             </el-form-item>
@@ -94,7 +90,7 @@
           <el-col :span="3" class="tleftb">
             <span>订金</span>
           </el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item>
               <span>{{ formobj.deposit }}</span>
             </el-form-item>
@@ -102,14 +98,14 @@
         </el-row>
         <el-row>
           <el-col :span="3" class="tleftb">车款账户名称</el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item>
               <span>{{ formobj.accountName }}</span></el-form-item>
           </el-col>
           <el-col :span="3" class="tleftb">
             <span>开户行</span>
           </el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item>
               <span>{{ formobj.depositBankName }}</span>
             </el-form-item>
@@ -117,7 +113,7 @@
           <el-col :span="3" class="tleftb">
             <span>银行账号</span>
           </el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item>
               <span>{{ formobj.bankAccount }}</span>
             </el-form-item>
@@ -125,14 +121,14 @@
         </el-row>
         <el-row v-if="formobj.isBeforePayment === '0'">
           <el-col :span="3" class="tleftb">订金账户名称</el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item>
               <span>{{ formobj.modelAccountName }}</span></el-form-item>
           </el-col>
           <el-col :span="3" class="tleftb">
             <span>开户行</span>
           </el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item>
               <span>{{ formobj.modelBankName }}</span>
             </el-form-item>
@@ -140,7 +136,7 @@
           <el-col :span="3" class="tleftb">
             <span>银行账号</span>
           </el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item>
               <span>{{ formobj.modelBankAccount }}</span>
             </el-form-item>
@@ -148,11 +144,11 @@
         </el-row>
         <el-row>
           <el-col :span="3" class="tleftb">其他费用名称</el-col>
-          <el-col :span="13" class="trightb">
+          <el-col :span="13">
             <el-form-item><span>{{ formobj.expenseName }}</span></el-form-item>
           </el-col>
           <el-col :span="3" class="tleftb">其他费用合计</el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item><span>{{ formobj.totalExpenseAmount }}</span></el-form-item>
           </el-col>
         </el-row>
@@ -160,7 +156,7 @@
           <el-col :span="3" class="tleftb">
             <span>备注</span>
           </el-col>
-          <el-col :span="21" class="trightb">
+          <el-col :span="21">
             <el-form-item>
               <span>{{ formobj.remarks }}</span></el-form-item>
           </el-col>
@@ -191,40 +187,13 @@
 
 <script>
 import req from '@/api/baseoutsourcingapplication/baseoutsourcingapplication'
-import {getStorage} from '@/utils/auth'
+import { getStorage } from '@/utils/auth'
 
 export default {
   name: 'BaseOutsourcingApplicationInfo',
   data() {
     return {
-      formobj: {
-        remarks: '',
-        insideCode: '',
-        useOrgName: '',
-        depositBankName: '',
-        bankAccount: '',
-        contract: {},
-        sid: '',
-        applicationCode: '123456', // 申请编号
-        createByName: window.sessionStorage.getItem('name'), // 申请人姓名
-        applicationDate: '', // 申请日期
-        externalMiningTypeKey: '1', // 外采类型key
-        externalMiningTypeValue: '', // 外采类型value
-        purchasingUnitName: '', // 采购单位名称
-        modelSid: '', // 车型sid
-        modelName: '', // 车型名称
-        configName: '', // 常用配置名称
-        configSid: '', // 常用配置sid
-        purchasePrice: '', // 采购价格
-        guidedPrice: '', // 销售指导价
-        manufactorSettlementPrice: '', // 厂家合同价
-        num: '0', // 台数
-        deposit: '', // 订金
-        expenseName: '', // 费用名称
-        totalExpenseAmount: '', // 费用金额合计
-        orgSid: '', // 部门sid
-        baseOutsourcingApplicationVehicleDtos: []
-      }
+      formobj: {}
     }
   },
   methods: {
@@ -261,37 +230,7 @@ export default {
       })
       req.fetchBySid(row.sid).then(resp => {
         if (resp.success) {
-          const vdata = resp.data
-          this.formobj.insideCode = vdata.insideCode
-          this.formobj.remarks = vdata.remarks
-          this.formobj.useOrgName = vdata.useOrgName
-          this.formobj.contract = vdata.contract
-          this.formobj.accountName = vdata.accountName
-          this.formobj.depositBankName = vdata.depositBankName
-          this.formobj.bankAccount = vdata.bankAccount
-          this.formobj.modelAccountName = vdata.modelAccountName
-          this.formobj.isBeforePayment = vdata.isBeforePayment
-          this.formobj.modelBankName = vdata.modelBankName
-          this.formobj.modelBankAccount= vdata.modelBankAccount
-          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.purchasingUnitSid = vdata.purchasingUnitSid // 采购单位sid
-          this.formobj.purchasingUnitName = vdata.purchasingUnitName // 采购单位名称
-          this.formobj.modelSid = vdata.modelSid // 车型sid
-          this.formobj.modelName = vdata.modelName // 车型名称
-          this.formobj.configName = vdata.configName // 常用配置名称
-          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
+          this.formobj = resp.data
         }
       }).catch(e => {
         this.formobj = row
diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue
index 187eb42fc0..c3065fd090 100644
--- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue
@@ -19,26 +19,22 @@
         <div class="wlInfo" style="text-align: right;"><span style="font-size:14px;">金额单位：元</span></div>
         <el-row style="border-top: 1px solid #e0e3eb">
           <el-col :span="3" class="tleftb">分公司名称</el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item>
               <span>{{ formobj.useOrgName }}</span></el-form-item>
           </el-col>
           <el-col :span="3" class="tleftb">申请人姓名</el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item><span>{{ formobj.createByName }}</span></el-form-item>
           </el-col>
           <el-col :span="3" class="tleftb">申请日期</el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item><span>{{ formobj.applicationDate }}</span></el-form-item>
           </el-col>
         </el-row>
-        <!--	<el-row>
-            <el-col :span="3" class="tleftb">采购单位名称</el-col>
-            <el-col :span="21" class="trightb"><el-form-item><span>{{ formobj.purchasingUnitName }}</span></el-form-item></el-col>
-          </el-row>-->
         <el-row>
           <el-col :span="3" class="tleftb">车型名称</el-col>
-          <el-col :span="21" class="trightb">
+          <el-col :span="21">
             <el-form-item><span>{{ formobj.modelName }}</span></el-form-item>
           </el-col>
         </el-row>
@@ -52,28 +48,28 @@
           <el-col :span="3" class="tleftb">
             <span>内部编码</span>
           </el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item>
               <span>{{ formobj.insideCode }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="3" class="tleftb">销售指导价</el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item><span>{{ formobj.guidedPrice }}</span></el-form-item>
           </el-col>
           <el-col :span="3" class="tleftb">厂家合同价</el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item><span>{{ formobj.manufactorSettlementPrice }}</span></el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="3" class="tleftb">外采供应商</el-col>
-          <el-col :span="13" class="trightb">
+          <el-col :span="13">
             <el-form-item>
               <span>{{ formobj.purchasingUnitName }}</span></el-form-item>
           </el-col>
           <el-col :span="3" class="tleftb">是否先付款</el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item><span>{{ formobj.isBeforePayment === '1' ? '是' : '否' }}</span></el-form-item>
           </el-col>
         </el-row>
@@ -81,14 +77,14 @@
           <el-col :span="3" class="tleftb">
             <span>采购价格</span>
           </el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item>
               <span>{{ formobj.purchasePrice }}</span></el-form-item>
           </el-col>
           <el-col :span="3" class="tleftb">
             <span>台数</span>
           </el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item>
               <span>{{ formobj.num }}</span>
             </el-form-item>
@@ -96,7 +92,7 @@
           <el-col :span="3" class="tleftb">
             <span>订金</span>
           </el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item>
               <span>{{ formobj.deposit }}</span>
             </el-form-item>
@@ -104,14 +100,14 @@
         </el-row>
         <el-row>
           <el-col :span="3" class="tleftb">车款账户名称</el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item>
               <span>{{ formobj.accountName }}</span></el-form-item>
           </el-col>
           <el-col :span="3" class="tleftb">
             <span>开户行</span>
           </el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item>
               <span>{{ formobj.depositBankName }}</span>
             </el-form-item>
@@ -119,7 +115,7 @@
           <el-col :span="3" class="tleftb">
             <span>银行账号</span>
           </el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item>
               <span>{{ formobj.bankAccount }}</span>
             </el-form-item>
@@ -127,14 +123,14 @@
         </el-row>
         <el-row v-if="formobj.isBeforePayment === '0'">
           <el-col :span="3" class="tleftb">订金账户名称</el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item>
               <span>{{ formobj.modelAccountName }}</span></el-form-item>
           </el-col>
           <el-col :span="3" class="tleftb">
             <span>开户行</span>
           </el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item>
               <span>{{ formobj.modelBankName }}</span>
             </el-form-item>
@@ -142,7 +138,7 @@
           <el-col :span="3" class="tleftb">
             <span>银行账号</span>
           </el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item>
               <span>{{ formobj.modelBankAccount }}</span>
             </el-form-item>
@@ -150,11 +146,11 @@
         </el-row>
         <el-row>
           <el-col :span="3" class="tleftb">其他费用名称</el-col>
-          <el-col :span="13" class="trightb">
+          <el-col :span="13">
             <el-form-item><span>{{ formobj.expenseName }}</span></el-form-item>
           </el-col>
           <el-col :span="3" class="tleftb">费用金额合计</el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item><span>{{ formobj.totalExpenseAmount }}</span></el-form-item>
           </el-col>
         </el-row>
@@ -162,7 +158,7 @@
           <el-col :span="3" class="tleftb">
             <span>备注</span>
           </el-col>
-          <el-col :span="21" class="trightb">
+          <el-col :span="21">
             <el-form-item>
               <span>{{ formobj.remarks }}</span></el-form-item>
           </el-col>
@@ -193,14 +189,14 @@
       <el-form label-position="right" class="formadd">
         <el-row style="border-top: 1px solid #E0E3EB">
           <el-col :span="4" class="tleftb">当前环节</el-col>
-          <el-col :span="20" class="trightb">
-            <el-form-item prop="purchasingUnitName"><span>{{ formobj.taskName }}->{{ nextNode.name }}</span>
+          <el-col :span="20">
+            <el-form-item><span>{{ formobj.taskName }}->{{ nextNode.name }}</span>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="4" class="tleftb">意见</el-col>
-          <el-col :span="20" class="trightb">
+          <el-col :span="20">
             <el-form-item>
               <el-input v-model="formobj.comment" placeholder="审批意见" class="addinputw" clearable></el-input>
             </el-form-item>
@@ -217,14 +213,14 @@
       <el-form label-position="right" class="formadd">
         <el-row style="border-top: 1px solid #E0E3EB">
           <el-col :span="4" class="tleftb">当前环节</el-col>
-          <el-col :span="20" class="trightb">
-            <el-form-item prop="purchasingUnitName"><span>{{ formobj.taskName }}->{{ nextNode.name }}</span>
+          <el-col :span="20">
+            <el-form-item><span>{{ formobj.taskName }}->{{ nextNode.name }}</span>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="4" class="tleftb">意见</el-col>
-          <el-col :span="20" class="trightb">
+          <el-col :span="20">
             <el-form-item>
               <el-input v-model="formobj.comment" placeholder="审批意见" class="addinputw" clearable></el-input>
             </el-form-item>
@@ -241,7 +237,7 @@
       <el-form label-position="right" class="formadd">
         <el-row style="border-top: 1px solid #E0E3EB">
           <el-col :span="4" class="tleftb">意见</el-col>
-          <el-col :span="20" class="trightb">
+          <el-col :span="20">
             <el-form-item>
               <el-input v-model="formobj.comment" placeholder="审批意见" class="addinputw" clearable></el-input>
             </el-form-item>
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 5b2cc136e2..bf0c51f0d6 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
@@ -1,21 +1,14 @@
 <template>
   <div class="app-container">
     <div v-show="viewState == 1">
-      <!-- 标题按钮部分开始 -->
       <div class="tab-header webtop">
-        <!-- 标题 -->
         <div>{{ viewTitle }}</div>
-        <!-- start 添加修改按钮 -->
         <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>
         </div>
-        <!-- end 添加修改按钮 -->
-        <!-- end 详情按钮 -->
       </div>
-      <!-- 标题按钮部分结束 -->
-      <!-- Start 新增修改部分 -->
       <div>
         <div class="titwu">外采申请表</div>
         <el-form ref="form_obj" :model="formobj" :rules="rules" label-position="right" class="formadd">
@@ -24,19 +17,19 @@
             <el-col :span="3" class="tleftb">
               <span><span class="icon">*</span>分公司名称</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item prop="applicationCode">{{ 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" class="trightb">
+            <el-col :span="5">
               <el-form-item prop="createByName">{{ 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" class="trightb">
+            <el-col :span="5">
               <el-form-item prop="applicationDate">{{ formobj.applicationDate }}</el-form-item>
             </el-col>
           </el-row>
@@ -44,27 +37,19 @@
               <el-col :span="3" class="tleftb">
                 <span><span class="icon">*</span>外采类型</span>
               </el-col>
-              <el-col :span="21" class="trightb" >
+              <el-col :span="21" >
                 <el-radio v-model="formobj.externalMiningTypeKey"  label="1">直接外采</el-radio>
                 <el-radio v-model="formobj.externalMiningTypeKey"  label="2">政策外采</el-radio>
               </el-col>
             </el-row>-->
-          <!--<el-row style="border-left: none; ">
-            <el-col :span="3" class="tleftb">
-              <span><span class="icon">*</span>采购单位</span>
-            </el-col>
-            <el-col :span="21" class="trightb">
-              <el-form-item prop="purchasingUnitName"><el-input v-model="formobj.purchasingUnitName" placeholder="采购单位" class="addinputw" clearable /></el-form-item>
-            </el-col>
-          </el-row>-->
           <el-row>
             <el-col :span="3" class="tleftb">
               <span><span class="icon">*</span>车型</span>
             </el-col>
-            <el-col :span="19" class="trightb">
+            <el-col :span="19">
               <el-form-item prop="modelName">{{ formobj.modelName }}</el-form-item>
             </el-col>
-            <el-col :span="2" class="trightb">
+            <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>
@@ -83,7 +68,7 @@
             <el-col :span="3" class="tleftb">
               <span>内部编码</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item prop="">
                 <span>{{ formobj.insideCode }}</span>
               </el-form-item>
@@ -91,13 +76,13 @@
             <el-col :span="3" class="tleftb">
               <span><span class="icon">*</span>销售指导价</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item prop="guidedPrice">{{ 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" class="trightb">
+            <el-col :span="5">
               <el-form-item prop="manufactorSettlementPrice">
                 <el-input v-model="formobj.manufactorSettlementPrice" class="addinputw" clearable></el-input>
               </el-form-item>
@@ -107,7 +92,7 @@
             <el-col :span="3" class="tleftb">
               <span><span class="icon">*</span>外采供应商</span>
             </el-col>
-            <el-col :span="13" class="trightb">
+            <el-col :span="13">
               <el-form-item prop="purchasingUnitName">
                 <el-input v-model="formobj.purchasingUnitName" placeholder="采购单位" class="addinputw" clearable/>
               </el-form-item>
@@ -115,7 +100,7 @@
             <el-col :span="3" class="tleftb">
               <span><span class="icon">*</span>是否先付车款</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <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>
@@ -126,7 +111,7 @@
             <el-col :span="3" class="tleftb">
               <span><span class="icon">*</span>采购价格</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item prop="purchasePrice">
                 <el-input v-model="formobj.purchasePrice" placeholder="采购价格" class="addinputw" clearable/>
               </el-form-item>
@@ -134,7 +119,7 @@
             <el-col :span="3" class="tleftb">
               <span><span class="icon">*</span>台数</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item v-show="formobj.externalMiningTypeKey==1" prop="num">
                 <el-input v-model="formobj.num" placeholder="台数" class="addinputw" clearable/>
               </el-form-item>
@@ -143,7 +128,7 @@
             <el-col :span="3" class="tleftb">
               <span><span class="icon">*</span>订金</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item prop="deposit">
                 <el-input style="height:10px;" :disabled="formobj.isBeforePayment === '1'" v-model="formobj.deposit" placeholder="订金" class="addinputw" clearable/>
               </el-form-item>
@@ -153,7 +138,7 @@
             <el-col :span="3" class="tleftb">
               <span><span class="icon">*</span>车款账户名称</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item prop="accountName">
                 <el-input v-model="formobj.accountName" placeholder="" class="addinputw" clearable/>
               </el-form-item>
@@ -161,7 +146,7 @@
             <el-col :span="3" class="tleftb">
               <span>开户行</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item>
                 <el-input v-model="formobj.depositBankName" placeholder="" class="addinputw" clearable/>
               </el-form-item>
@@ -169,7 +154,7 @@
             <el-col :span="3" class="tleftb">
               <span>银行账号</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item>
                 <el-input v-model="formobj.bankAccount" placeholder="" class="addinputw" clearable/>
               </el-form-item>
@@ -179,7 +164,7 @@
             <el-col :span="3" class="tleftb">
               <span>订金账户名称</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item>
                 <el-input v-model="formobj.modelAccountName" placeholder="" class="addinputw" clearable/>
               </el-form-item>
@@ -187,7 +172,7 @@
             <el-col :span="3" class="tleftb">
               <span>开户行</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item>
                 <el-input v-model="formobj.modelBankName" placeholder="" class="addinputw" clearable/>
               </el-form-item>
@@ -195,7 +180,7 @@
             <el-col :span="3" class="tleftb">
               <span>银行账号</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item>
                 <el-input v-model="formobj.modelBankAccount" placeholder="" class="addinputw" clearable/>
               </el-form-item>
@@ -205,7 +190,7 @@
             <el-col :span="3" class="tleftb">
               <span>其他费用名称</span>
             </el-col>
-            <el-col :span="13" class="trightb">
+            <el-col :span="13">
               <el-form-item prop="expenseName">
                 <el-input v-model="formobj.expenseName" placeholder="" class="addinputw" clearable/>
               </el-form-item>
@@ -213,7 +198,7 @@
             <el-col :span="3" class="tleftb">
               <span>费用合计</span>
             </el-col>
-            <el-col :span="5" class="trightb">
+            <el-col :span="5">
               <el-form-item prop="totalExpenseAmount">
                 <el-input v-model="formobj.totalExpenseAmount" placeholder="" class="addinputw" clearable/>
               </el-form-item>
@@ -223,7 +208,7 @@
             <el-col :span="3" class="tleftb">
               <span>备注</span>
             </el-col>
-            <el-col :span="21" class="trightb">
+            <el-col :span="21">
               <el-form-item prop="remarks">
                 <el-input v-model="formobj.remarks" placeholder="" class="addinputw" clearable/>
               </el-form-item>
@@ -270,20 +255,10 @@
           </div>
         </el-form>
       </div>
-    </div><!-- End 添加修改部分 -->
+    </div>
+    <!-- End 添加修改部分 -->
     <!-- 车型配置分页列表 -->
-    <!-- <el-dialog
-       title="车型库"
-       :visible.sync="dialogVisible"
-       width="90%"
-       show-close="false"
-       :before-close="handleClose">-->
-    <!--  <modellibrary   @doback="resetState" v-show="viewState == 1.2" ref="chexingxuanze" @handleChexing="selectChexing"></modellibrary>-->
-    <!--<span slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="queding(this)">确 定</el-button>
-    </span>
-  </el-dialog>-->
-    <configuration v-show="viewState == 1.2" ref="divconfiguration" @backData="selectChexing" @doback="closePage"/>
+    <configuration v-show="viewState == 2" ref="divconfiguration" @backData="selectChexing" @doback="closePage"/>
   </div>
 </template>
 <script>
@@ -526,11 +501,7 @@ export default {
       this.handReset()
     },
     selectModel() {
-      /* this.$router.push({ path: '/chexingchaxun/modelinquire/modellibrary' });*/
-      /* this.viewState = 1.2
-       this.$refs['modellibrary'].showData('123456');*/
-      this.viewState = 1.2
-      // this.$refs['chexingxuanze'].showChexing(this.formobj.baseOutsourcingApplicationVehicleDtos)
+      this.viewState = 2
       this.$refs['divconfiguration'].showData(this.formobj.baseOutsourcingApplicationVehicleDtos)
     },
     selectVehicleDialog() {
diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationInfo.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationInfo.vue
index 22d35b69b6..15b0d00f51 100644
--- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationInfo.vue
@@ -1,41 +1,33 @@
 <template>
   <div class="app-container">
-    <!-- 标题按钮部分开始 -->
     <div class="tab-header webtop">
-      <!-- 标题 -->
       <div>外采申请表详情</div>
-      <!--start 添加修改按钮-->
       <div>
         <el-button type="danger" size="small" @click="openRevoke">撤 回</el-button>
       </div>
     </div>
-    <!-- 标题按钮部分结束 -->
     <div>
       <div class="titwu">外采申请表</div>
       <el-form ref="form_obj" :model="formobj" label-position="right" class="formadd">
         <div style="text-align: right;"><span style="font-size:14px;">金额单位：元</span></div>
         <el-row style="border-top: 1px solid #e0e3eb">
           <el-col :span="3" class="tleftb">分公司名称</el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item>
               <span>{{ formobj.useOrgName }}</span></el-form-item>
           </el-col>
           <el-col :span="3" class="tleftb">申请人姓名</el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item><span>{{ formobj.createByName }}</span></el-form-item>
           </el-col>
           <el-col :span="3" class="tleftb">申请日期</el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item><span>{{ formobj.applicationDate }}</span></el-form-item>
           </el-col>
         </el-row>
-        <!--	<el-row>
-            <el-col :span="3" class="tleftb">采购单位名称</el-col>
-            <el-col :span="21" class="trightb"><el-form-item><span>{{ formobj.purchasingUnitName }}</span></el-form-item></el-col>
-          </el-row>-->
         <el-row>
           <el-col :span="3" class="tleftb">车型名称</el-col>
-          <el-col :span="21" class="trightb">
+          <el-col :span="21">
             <el-form-item><span>{{ formobj.modelName }}</span></el-form-item>
           </el-col>
         </el-row>
@@ -49,28 +41,28 @@
           <el-col :span="3" class="tleftb">
             <span>内部编码</span>
           </el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item>
               <span>{{ formobj.insideCode }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="3" class="tleftb">销售指导价</el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item><span>{{ formobj.guidedPrice }}</span></el-form-item>
           </el-col>
           <el-col :span="3" class="tleftb">厂家合同价</el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item><span>{{ formobj.manufactorSettlementPrice }}</span></el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="3" class="tleftb">外采供应商</el-col>
-          <el-col :span="13" class="trightb">
+          <el-col :span="13">
             <el-form-item>
               <span>{{ formobj.purchasingUnitName }}</span></el-form-item>
           </el-col>
           <el-col :span="3" class="tleftb">是否先付款</el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item><span>{{ formobj.isBeforePayment === '1' ? '是' : '否' }}</span></el-form-item>
           </el-col>
         </el-row>
@@ -78,14 +70,14 @@
           <el-col :span="3" class="tleftb">
             <span>采购价格</span>
           </el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item>
               <span>{{ formobj.purchasePrice }}</span></el-form-item>
           </el-col>
           <el-col :span="3" class="tleftb">
             <span>台数</span>
           </el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item>
               <span>{{ formobj.num }}</span>
             </el-form-item>
@@ -93,7 +85,7 @@
           <el-col :span="3" class="tleftb">
             <span>订金</span>
           </el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item>
               <span>{{ formobj.deposit }}</span>
             </el-form-item>
@@ -101,14 +93,14 @@
         </el-row>
         <el-row>
           <el-col :span="3" class="tleftb">车款账户名称</el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item>
               <span>{{ formobj.accountName }}</span></el-form-item>
           </el-col>
           <el-col :span="3" class="tleftb">
             <span>开户行</span>
           </el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item>
               <span>{{ formobj.depositBankName }}</span>
             </el-form-item>
@@ -116,7 +108,7 @@
           <el-col :span="3" class="tleftb">
             <span>银行账号</span>
           </el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item>
               <span>{{ formobj.bankAccount }}</span>
             </el-form-item>
@@ -124,14 +116,14 @@
         </el-row>
         <el-row v-if="formobj.isBeforePayment === '0'">
           <el-col :span="3" class="tleftb">订金账户名称</el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item>
               <span>{{ formobj.modelAccountName }}</span></el-form-item>
           </el-col>
           <el-col :span="3" class="tleftb">
             <span>开户行</span>
           </el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item>
               <span>{{ formobj.modelBankName }}</span>
             </el-form-item>
@@ -139,7 +131,7 @@
           <el-col :span="3" class="tleftb">
             <span>银行账号</span>
           </el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item>
               <span>{{ formobj.modelBankAccount }}</span>
             </el-form-item>
@@ -147,11 +139,11 @@
         </el-row>
         <el-row>
           <el-col :span="3" class="tleftb">其他费用名称</el-col>
-          <el-col :span="13" class="trightb">
+          <el-col :span="13">
             <el-form-item><span>{{ formobj.expenseName }}</span></el-form-item>
           </el-col>
           <el-col :span="3" class="tleftb">费用金额合计</el-col>
-          <el-col :span="5" class="trightb">
+          <el-col :span="5">
             <el-form-item><span>{{ formobj.totalExpenseAmount }}</span></el-form-item>
           </el-col>
         </el-row>
@@ -159,7 +151,7 @@
           <el-col :span="3" class="tleftb">
             <span>备注</span>
           </el-col>
-          <el-col :span="21" class="trightb">
+          <el-col :span="21">
             <el-form-item>
               <span>{{ formobj.remarks }}</span></el-form-item>
           </el-col>