From 00f2c45def1b71ec83d05a148c6f10e8bfc2bb6b Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Sat, 12 Nov 2022 11:56:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=BD=A6=E8=BE=86=E5=A4=96?=
 =?UTF-8?q?=E9=87=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../baseoutsourcingapplication.vue                         | 7 ++++---
 .../baseoutsourcingapplicationAdd.vue                      | 3 +++
 2 files changed, 7 insertions(+), 3 deletions(-)

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 2ec1c99af8..09d6b093cf 100644
--- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplication.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplication.vue
@@ -33,9 +33,9 @@
         <!-- Start 项目列表 -->
         <div class="">
           <el-table v-loading="tableLoading" :data="dataList" 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 width="150px" label="操作" align="center">
+            <el-table-column fixed width="50px" type="selection" align="center"/>
+            <el-table-column fixed width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column fixed 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="toEdit(scope.row)">办理
                 </el-button>
@@ -51,6 +51,7 @@
             </el-table-column>
             <el-table-column prop="applicationCode" width="200px;" label="申请编号" align="center"/>
             <el-table-column prop="applicationDate" width="110px;" label="申请日期" align="center"/>
+            <el-table-column prop="useOrgName" width="200px;" label="分公司" align="center"/>
             <el-table-column prop="modelName" label="车型" align="center"/>
             <el-table-column prop="num" width="100px;" label="台数" align="center"/>
             <el-table-column prop="purchasePrice" width="90px;" label="采购价格" align="center"/>
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 5977dc2cd1..ae9cc11edb 100644
--- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue
@@ -560,6 +560,9 @@ export default {
       this.formobj.applicationDate = dayDate
       this.formobj.createByName = window.sessionStorage.getItem('name')
       this.formobj.contract = {}
+      this.formobj.isSaleOrgApproval = '1'
+      this.formobj.isBeforePayment = '0'
+      this.formobj.manufactorSettlementPrice = '0'
       this.fileList = []
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()