From 472945d0f0bfa79e090464fba61b17fcbff1263a Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Sun, 24 Jul 2022 12:21:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8E=92=E4=BA=A7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E3=80=81=E8=B0=83=E4=BB=B7=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tiaojiaguanli/chexingbyconfiguration.vue  |   8 +-
 .../kucunguanli/tiaojiaguanli/priceAdd.vue    | 163 ++++++--------
 .../kucunguanli/tiaojiaguanli/priceInfo.vue   | 141 ++++++------
 .../kucunguanli/tiaojiaguanli/priceguanli.vue |  41 +---
 .../cheliangpaichan/cheliangpaichanInfo.vue   |   7 -
 .../chexingbyconfiguration.vue                |  19 +-
 .../cheliangpaichanDaiBanInfo.vue             |   7 -
 .../cheliangpaichanYiBanInfo.vue              |   7 -
 .../paichanguanli/chexingbyconfiguration.vue  |  19 +-
 .../tiaojiaguanli/chexingbyconfiguration.vue  |   8 +-
 .../tiaojiaguanli/tiaojiaDaiBanInfo.vue       | 200 +++++++-----------
 .../tiaojiaguanli/tiaojiaEdit.vue             | 182 +++++++---------
 .../tiaojiaguanli/tiaojianYibanInfo.vue       | 175 ++++++---------
 13 files changed, 374 insertions(+), 603 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/chexingbyconfiguration.vue b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/chexingbyconfiguration.vue
index 6a9420eda7..02bb9bdc1c 100644
--- a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/chexingbyconfiguration.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/chexingbyconfiguration.vue
@@ -21,8 +21,8 @@
               </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center">
-              <el-button type="primary" size="small" @click="handleFilter">查询</el-button>
-              <el-button type="primary" size="small" @click="handresetting">重置</el-button>
+              <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>
@@ -30,12 +30,12 @@
           <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">
+            <el-table-column label="车型" align="center" width="300">
               <template slot-scope="scope">
                 <span>{{ scope.row.vehicleAlias }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="常用配置" align="center">
+            <el-table-column label="常用配置" header-align="center" align="left">
               <template slot-scope="scope">
                 <span>{{ scope.row.configName }}</span>
               </template>
diff --git a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceAdd.vue b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceAdd.vue
index 8670706dbc..af7589dee9 100644
--- a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceAdd.vue
@@ -17,78 +17,68 @@
       <!--标题按钮部分结束-->
       <!--Start 新增修改部分-->
       <div class="listconadd">
-        <div class="wlInfo"><span>车辆调价申请</span></div>
-        <el-form ref="form_obj" :model="formobj" :rules="rules">
-          <el-row>
-            <el-col :span="4">
-              <span>调价申请日期:</span>
+        <div class="titwu"><span>车辆调价申请</span></div>
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row class="rowStyle">
+            <el-col :span="12" class="colStyle">
+              <div class="span-sty spanOneWidth"><span>调价申请日期:</span></div>
+              <el-form-item><span class="addinputInfo addinputOne">{{ formobj.createTime }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
-              <span style="margin-left: 5px">{{ formobj.createTime }}</span>
-            </el-col>
-            <el-col :span="4">
-              <span>申请人:</span>
-            </el-col>
-            <el-col :span="8">
-              <span style="margin-left: 5px">{{ formobj.applyPeoName }}</span>
+            <el-col :span="12" class="colStyle">
+              <div class="span-sty spanOneWidth"><span>申请人:</span></div>
+              <el-form-item><span class="addinputInfo addinputOne">{{ formobj.applyPeoName }}</span></el-form-item>
             </el-col>
           </el-row>
-          <el-row>
-            <el-col :span="4" class="el-form-item-right">
-              <span>调价原因:</span>
-            </el-col>
-            <el-col :span="20">
-              <el-form-item>
-                <el-input v-model="formobj.modpriceReason" clearable style="width: 30%"/>
-              </el-form-item>
+          <el-row class="rowStyle">
+            <el-col :span="24" class="colStyle">
+              <div class="span-sty spanOneWidth"><span>调价原因:</span></div>
+              <el-form-item><el-input v-model="formobj.modpriceReason" clearable class="addinputw addinputOne" placeholder=""/></el-form-item>
             </el-col>
           </el-row>
-        </el-form>
-        <div class="tableStyle">
-          <div style="margin-left: 5px;font-weight: bold">车辆列表</div>
-          <div style="margin-left: 15px">
+          <div class="title">
+            <div>车辆列表</div>
             <el-button type="primary" size="mini" icon="el-icon-plus" @click="addCommodity()">选择车型</el-button>
           </div>
-        </div>
-        <el-table :key="tableKey" :data="formobj.baseModelModpriceModels" :index="index" border style="width: 100%">
-          <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-          <el-table-column fixed prop="name" label="操作" width="100px" align="center" header-align="center">
-            <template slot-scope="scope">
-              <el-button size="mini" type="danger" @click="dataDelete(scope.$index, formobj.baseModelModpriceModels[scope.$index])">删除
-              </el-button>
-            </template>
-          </el-table-column>
-          <el-table-column label="车型" align="left" header-align="center" width="250">
-            <template slot-scope="scope">
-              <span>{{ scope.row.vehicleAlias }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="常用配置" align="left" header-align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.configName }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="applyForDeposit" label="成本价" header-align="center" width="150">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.costPrice" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
-            </template>
-          </el-table-column>
-          <el-table-column label="现销售指导价(万元)" header-align="center" width="150">
-            <template slot-scope="scope">
-              <span>{{ scope.row.guidedPrice }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="价格增减数额" header-align="center" width="200">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.incOrDecInPrice" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
-            </template>
-          </el-table-column>
-          <el-table-column label="备注" header-align="center" width="200">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.remarks" placeholder="" class="addinputw" clearable/>
-            </template>
-          </el-table-column>
-        </el-table>
+          <el-table :key="tableKey" :data="formobj.baseModelModpriceModels" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column fixed prop="name" label="操作" width="100px" align="center" header-align="center">
+              <template slot-scope="scope">
+                <el-button size="mini" type="danger" @click="dataDelete(scope.$index, formobj.baseModelModpriceModels[scope.$index])">删除
+                </el-button>
+              </template>
+            </el-table-column>
+            <el-table-column label="车型" align="left" header-align="center" width="250">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vehicleAlias }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="常用配置" align="left" header-align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.configName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="applyForDeposit" label="成本价" header-align="center" width="150">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.costPrice" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
+              </template>
+            </el-table-column>
+            <el-table-column label="现销售指导价(万元)" header-align="center" width="150">
+              <template slot-scope="scope">
+                <span>{{ scope.row.guidedPrice }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="价格增减数额" header-align="center" width="200">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.incOrDecInPrice" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" header-align="center" width="200">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.remarks" placeholder="" class="addinputw" clearable/>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form>
       </div>
     </div>
     <!--End 添加修改部分-->
@@ -273,39 +263,26 @@ export default {
 </script>
 
 <style scoped>
-.wlInfo {
-  text-align: center;
-  font-size: 28px;
-  line-height: 90px;
-}
-.tableStyle {
-  background-color: #FFFFFF;
+.title {
+  padding: 7px;
   display: flex;
-  justify-content: flex-start;
+  flex-direction: row;
+  justify-content: space-between;
   align-items: center;
-  border: 1px solid #dfe4ed;
-  height: 40px;
 }
-/deep/ .el-col-4 {
-  text-align: right;
-  float: left;
-  font-size: 14px;
-  color: #606266;
-  line-height: 40px !important;
-  font-weight: 600;
+.spanOneWidth {
+  border-right: 0px !important;
+  width: 200px !important;
 }
-/deep/ .el-col-8 {
-  text-align: left;
-  float: left;
-  font-size: 14px;
-  color: #606266;
-  line-height: 40px !important;
-  font-weight: 600;
+.addinputOne {
+  margin-left: 200px !important;
 }
-
-.icon {
-  color: #e84026;
-  margin-right: 4px;
+.rowStyle {
+  border-left: 0px;
+}
+.colStyle {
+  border-right: 0px !important;
+  border-bottom: 0px !important;
 }
 </style>
 
diff --git a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceInfo.vue b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceInfo.vue
index 650034c64e..febd44ec16 100644
--- a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceInfo.vue
@@ -13,69 +13,61 @@
       <!--标题按钮部分结束-->
       <!--Start 新增修改部分-->
       <div class="listconadd">
-        <div class="wlInfo"><span>车辆调价申请</span></div>
-        <el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top">
-          <el-row>
-            <el-col :span="4">
-              <span>调价申请日期:</span>
+        <div class="titwu"><span>车辆调价申请</span></div>
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row class="rowStyle">
+            <el-col :span="12" class="colStyle">
+              <div class="span-sty spanOneWidth"><span>调价申请日期:</span></div>
+              <el-form-item><span class="addinputInfo addinputOne">{{ formobj.createTime }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
-              <span style="margin-left: 5px">{{ formobj.createTime }}</span>
-            </el-col>
-            <el-col :span="4">
-              <span>申请人:</span>
-            </el-col>
-            <el-col :span="8">
-              <span style="margin-left: 5px">{{ formobj.applyPeoName }}</span>
+            <el-col :span="12" class="colStyle">
+              <div class="span-sty spanOneWidth"><span>申请人:</span></div>
+              <el-form-item><span class="addinputInfo addinputOne">{{ formobj.applyPeoName }}</span></el-form-item>
             </el-col>
           </el-row>
-          <el-row>
-            <el-col :span="4" class="el-form-item-right">
-              <span>调价原因:</span>
-            </el-col>
-            <el-col :span="20">
-              <el-form-item>
-                <span style="margin-left: 5px">{{ formobj.modpriceReason }}</span>
-              </el-form-item>
+          <el-row class="rowStyle">
+            <el-col :span="24" class="colStyle">
+              <div class="span-sty spanOneWidth"><span>调价原因:</span></div>
+              <el-form-item><span class="addinputInfo addinputOne">{{ formobj.modpriceReason }}</span></el-form-item>
             </el-col>
           </el-row>
+          <div class="title">
+            <div>车辆列表</div>
+          </div>
+          <el-table :key="tableKey" :data="formobj.baseModelModpriceModels" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" 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="常用配置" align="left" header-align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.configName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="applyForDeposit" label="成本价" align="center" width="150">
+              <template slot-scope="scope">
+                <span>{{ scope.row.costPrice }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="现销售指导价(元)" align="center" width="150">
+              <template slot-scope="scope">
+                <span>{{ scope.row.guidedPrice }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="价格增减数额" align="center" width="150">
+              <template slot-scope="scope">
+                <span>{{ scope.row.incOrDecInPrice }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" header-align="center" width="200">
+              <template slot-scope="scope">
+                <span>{{ scope.row.remarks }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
         </el-form>
-        <div class="tableStyle">
-          <div style="margin-left: 5px;font-weight: bold">车辆列表</div>
-        </div>
-        <el-table :key="tableKey" :data="formobj.baseModelModpriceModels" :index="index" border style="width: 100%">
-          <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-          <el-table-column label="车型" align="center" header-align="center" width="250">
-            <template slot-scope="scope">
-              <span>{{ scope.row.vehicleAlias }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="常用配置" align="left" header-align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.configName }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="applyForDeposit" label="成本价" header-align="center" align="center" width="150">
-            <template slot-scope="scope">
-              <span>{{ scope.row.costPrice }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="现销售指导价(万元)" header-align="center" align="center" width="150">
-            <template slot-scope="scope">
-              <span>{{ scope.row.guidedPrice }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="价格增减数额" header-align="center" align="center" width="200">
-            <template slot-scope="scope">
-              <span>{{ scope.row.incOrDecInPrice }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="备注" header-align="center" width="200">
-            <template slot-scope="scope">
-              <span>{{ scope.row.remarks }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
       </div>
     </div>
     <!--End 添加修改部分-->
@@ -121,34 +113,19 @@ export default {
 </script>
 
 <style scoped>
-.wlInfo {
-  text-align: center;
-  font-size: 28px;
-  line-height: 90px;
+.spanOneWidth {
+  border-right: 0px !important;
+  width: 200px !important;
 }
-.tableStyle {
-  background-color: #FFFFFF;
-  display: flex;
-  justify-content: flex-start;
-  align-items: center;
-  border: 1px solid #dfe4ed;
-  height: 40px;
+.addinputOne {
+  margin-left: 200px !important;
 }
-/deep/ .el-col-4 {
-  text-align: right;
-  float: left;
-  font-size: 14px;
-  color: #606266;
-  line-height: 40px !important;
-  font-weight: 600;
+.rowStyle {
+  border-left: 0px;
 }
-/deep/ .el-col-8 {
-  text-align: left;
-  float: left;
-  font-size: 14px;
-  color: #606266;
-  line-height: 40px !important;
-  font-weight: 600;
+.colStyle {
+  border-right: 0px !important;
+  border-bottom: 0px !important;
 }
 </style>
 
diff --git a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceguanli.vue b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceguanli.vue
index 28abd7fdb3..fb67df47a4 100644
--- a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceguanli.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceguanli.vue
@@ -9,18 +9,14 @@
           <div v-show="isSearchShow" class="search">
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
               <el-form-item label="申请日期">
-                <div class="block" style="float: left;">
-                  <el-date-picker v-model="listQuery.params.createStartTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
-                </div>
-                <div style="float: left;margin: 0px 10px">至</div>
-                <div class="block" style="float: left;">
-                  <el-date-picker v-model="listQuery.params.createEndTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
-                </div>
+                <el-date-picker v-model="listQuery.params.createStartTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.createEndTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
               </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
-              <el-button type="primary" @click="handleFilter" size="small">查询</el-button>
-              <el-button type="primary" @click="handleReset" size="small">重置</el-button>
+              <el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
+              <el-button type="primary" icon="el-icon-refresh" @click="handleReset" size="small">重置</el-button>
             </div>
           </div>
         </div>
@@ -291,31 +287,4 @@ export default {
 }
 </script>
 <style scoped>
-.btn {
-  padding: 15px 0 15px 0;
-  border: 1px solid #e0e3eb;
-}
-
-.tab-header {
-  background-color: #edf1f7;
-  padding: 8px 20px;
-  margin-bottom: 0 !important;
-}
-
-.tab-header /deep/ .el-form-item {
-  margin-bottom: 10px;
-}
-.listtop {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  border: 1px solid #dfe4ed;
-  height: 40px;
-}
-.tit {
-  margin-bottom: -10px;
-}
-.pagination {
-  margin-bottom: -10px;
-}
 </style>
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue
index 7283ff19e4..32987d2050 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue
@@ -216,13 +216,6 @@ export default {
 </script>
 
 <style scoped>
-.title {
-  padding: 7px;
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  align-items: center;
-}
 .spanOneWidth {
   border-right: 0px !important;
   width: 150px !important;
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/chexingbyconfiguration.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/chexingbyconfiguration.vue
index 8244de617f..9d5bde396d 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/chexingbyconfiguration.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/chexingbyconfiguration.vue
@@ -137,18 +137,13 @@ export default {
     },
     // 重置按钮
     handresetting() {
-      this.listQuery = {
-        current: 1,
-        size: 10,
-        params: {
-          vehicleAlias: '',
-          configName: '',
-          useOrgSid: '',
-          vehicleStateValue: '',
-          sidList: []
-        },
-        total: 1
-      }
+      this.listQuery.current = 1
+      this.listQuery.total = 0
+      this.listQuery.size = 10
+      this.listQuery.params.vehicleAlias = ''
+      this.listQuery.params.configName = ''
+      this.listQuery.params.useOrgSid = ''
+      this.listQuery.params.vehicleStateValue = ''
       this.getPathSid()
     },
     handleSelectionChange(row) {
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue
index cc9cfea54f..ad18d76501 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue
@@ -404,13 +404,6 @@ export default {
 .listconadd {
   height: calc(100vh - 0px) !important;
 }
-.title {
-  padding: 7px;
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  align-items: center;
-}
 .spanOneWidth {
   border-right: 0px !important;
   width: 150px !important;
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue
index a9f15b4248..1626339380 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue
@@ -264,13 +264,6 @@ export default {
 .listconadd {
   height: calc(100vh - 0px) !important;
 }
-.title {
-  padding: 7px;
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  align-items: center;
-}
 .spanOneWidth {
   border-right: 0px !important;
   width: 150px !important;
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/chexingbyconfiguration.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/chexingbyconfiguration.vue
index 4a44bf0225..61d585ae99 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/chexingbyconfiguration.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/chexingbyconfiguration.vue
@@ -137,18 +137,13 @@ export default {
     },
     // 重置按钮
     handresetting() {
-      this.listQuery = {
-        current: 1,
-        size: 10,
-        params: {
-          vehicleAlias: '',
-          configName: '',
-          useOrgSid: '',
-          vehicleStateValue: '',
-          sidList: []
-        },
-        total: 1
-      }
+      this.listQuery.current = 1
+      this.listQuery.total = 0
+      this.listQuery.size = 10
+      this.listQuery.params.vehicleAlias = ''
+      this.listQuery.params.configName = ''
+      this.listQuery.params.useOrgSid = ''
+      this.listQuery.params.vehicleStateValue = ''
       this.getPathSid()
     },
     handleSelectionChange(row) {
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/chexingbyconfiguration.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/chexingbyconfiguration.vue
index 61fbcf4fb4..6ff124acc8 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/chexingbyconfiguration.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/chexingbyconfiguration.vue
@@ -21,8 +21,8 @@
               </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center">
-              <el-button type="primary" size="small" @click="handleFilter">查询</el-button>
-              <el-button type="primary" size="small" @click="handresetting">重置</el-button>
+              <el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter">查询</el-button>
+              <el-button type="primary" size="small" icon="el-icon-refresh" @click="handresetting">重置</el-button>
             </div>
           </div>
         </div>
@@ -30,12 +30,12 @@
           <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">
+            <el-table-column label="车型" align="center" width="300">
               <template slot-scope="scope">
                 <span>{{ scope.row.vehicleAlias }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="常用配置" align="center">
+            <el-table-column label="常用配置" header-align="center" align="left">
               <template slot-scope="scope">
                 <span>{{ scope.row.configName }}</span>
               </template>
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaDaiBanInfo.vue
index abca558402..3a6a0d84f1 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaDaiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaDaiBanInfo.vue
@@ -7,94 +7,81 @@
         <div>车辆调价详情</div>
         <!--start 添加修改按钮-->
         <div>
-          <el-button type="primary" @click="openAgree('同意')">同 意</el-button>
-          <el-button type="danger" @click="openReject('驳回')">驳 回</el-button>
-          <el-button type="danger" @click="openStop('终止')">终 止</el-button>
+          <el-button type="primary" size="small" @click="openAgree('同意')">同 意</el-button>
+          <el-button type="danger" size="small" @click="openReject('驳回')">驳 回</el-button>
+          <el-button type="danger" size="small" @click="openStop('终止')">终 止</el-button>
         </div>
       </div>
-      <!--标题按钮部分结束-->
-      <!--Start 新增修改部分-->
       <div class="listconadd">
-        <div class="wlInfo"><span>车辆调价申请</span></div>
-        <el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top">
-          <el-row>
-            <el-col :span="4">
-              <span>调价申请日期:</span>
+        <div class="titwu"><span>车辆调价申请</span></div>
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row class="rowStyle">
+            <el-col :span="12" class="colStyle">
+              <div class="span-sty spanOneWidth"><span>调价申请日期:</span></div>
+              <el-form-item><span class="addinputInfo addinputOne">{{ formobj.createTime }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
-              <span style="margin-left: 5px">{{ formobj.createTime }}</span>
-            </el-col>
-            <el-col :span="4">
-              <span>申请人:</span>
-            </el-col>
-            <el-col :span="8">
-              <span style="margin-left: 5px">{{ formobj.applyPeoName }}</span>
+            <el-col :span="12" class="colStyle">
+              <div class="span-sty spanOneWidth"><span>申请人:</span></div>
+              <el-form-item><span class="addinputInfo addinputOne">{{ formobj.applyPeoName }}</span></el-form-item>
             </el-col>
           </el-row>
-          <el-row>
-            <el-col :span="4" class="el-form-item-right">
-              <span>调价原因:</span>
-            </el-col>
-            <el-col :span="20">
-              <el-form-item>
-                <span style="margin-left: 5px">{{ formobj.modpriceReason }}</span>
-              </el-form-item>
+          <el-row class="rowStyle">
+            <el-col :span="24" class="colStyle">
+              <div class="span-sty spanOneWidth"><span>调价原因:</span></div>
+              <el-form-item><span class="addinputInfo addinputOne">{{ formobj.modpriceReason }}</span></el-form-item>
             </el-col>
           </el-row>
+          <div class="title">
+            <div>车辆列表</div>
+          </div>
+          <el-table :key="tableKey" :data="formobj.baseModelModpriceModels" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" 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="常用配置" align="left" header-align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.configName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="applyForDeposit" label="成本价" align="center" width="150">
+              <template slot-scope="scope">
+                <span>{{ scope.row.costPrice }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="现销售指导价(元)" align="center" width="150">
+              <template slot-scope="scope">
+                <span>{{ scope.row.guidedPrice }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="价格增减数额" align="center" width="150">
+              <template slot-scope="scope">
+                <span>{{ scope.row.incOrDecInPrice }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" header-align="center" width="200">
+              <template slot-scope="scope">
+                <span>{{ scope.row.remarks }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
         </el-form>
-        <div class="tableStyle">
-          <div style="margin-left: 5px;font-weight: bold">车辆列表</div>
-        </div>
-        <el-table :key="tableKey" :data="formobj.baseModelModpriceModels" :index="index" border style="width: 100%">
-          <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-          <el-table-column label="车型" align="center" header-align="center" width="250">
-            <template slot-scope="scope">
-              <span>{{ scope.row.vehicleAlias }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="常用配置" align="left" header-align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.configName }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="applyForDeposit" label="成本价" header-align="center" align="center" width="150">
-            <template slot-scope="scope">
-              <span>{{ scope.row.costPrice }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="现销售指导价(万元)" header-align="center" align="center" width="150">
-            <template slot-scope="scope">
-              <span>{{ scope.row.guidedPrice }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="价格增减数额" header-align="center" align="center" width="200">
-            <template slot-scope="scope">
-              <span>{{ scope.row.incOrDecInPrice }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="备注" header-align="center" width="200">
-            <template slot-scope="scope">
-              <span>{{ scope.row.remarks }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
       </div>
     </div>
-    <!--End 添加修改部分-->
-    <span class="el-icon-picture-outline">流程图</span>
-    <flow :xmlData="xmlData" :taskData="taskList"></flow>
     <el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
-      <el-form label-position="right" class="formadd" >
-        <el-row v-show="currentLink">
-          <el-col :span="4" class="tleftb">当前环节</el-col>
-          <el-col :span="20" class="trightb">
-            <el-form-item prop="purchasingUnitName"><span>{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
+      <el-form class="formaddcopy02" >
+        <el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
+          <el-col :span="24">
+            <div class="span-sty spanTwoWidth"><span>当前环节:</span></div>
+            <el-form-item><span class="addinputInfo addinputTwo">{{ current.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-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw" clearable ></el-input>
+          <el-col :span="24">
+            <div class="span-sty spanTwoWidth"><span>意见:</span></div>
+            <el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw addinputTwo" clearable ></el-input></el-form-item>
           </el-col>
         </el-row>
         <div style="text-align:center;margin-top: 20px;">
@@ -108,13 +95,9 @@
 
 <script>
 import req from '@/api/kucunguanli/price'
-import flow from '../../../baseoutsourcingapplication/workflow/flow'
 
 export default {
   name: 'tiaojiaInfo',
-  components: {
-    flow
-  },
   data() {
     return {
       dialogStatus: '',
@@ -124,8 +107,6 @@ export default {
       dialogList: {
         comment: ''
       },
-      xmlData: '', // 模型xml数据
-      taskList: [],
       startTask: true,
       current: {
         taskDefKey: '',
@@ -166,8 +147,6 @@ export default {
     // 加载表单数据
     this.showInfo(obj.businessSid)
     // 加载流程图相关的数据
-    this.getModelDetail(obj.deployId)
-    this.getFlowViewer(obj.instanceId)
   },
   mounted() {
     window.parent.postMessage({
@@ -175,7 +154,7 @@ export default {
       params: {
         // 告诉父级页面，子页面的弹框高度。
         code: 2,
-        data: document.body.scrollHeight + 'px'
+        data: 450 + 'px'
       }
     }, '*')
   },
@@ -187,19 +166,6 @@ export default {
         }
       })
     },
-    /** xml 文件 */
-    getModelDetail(deployId) {
-      // 发送请求，获取xml
-      req.readXml(deployId).then((res) => {
-        this.xmlData = res.data
-      })
-    },
-    // 已办环节的节点
-    getFlowViewer(procInsId) {
-      req.getFlowViewer(procInsId).then((res) => {
-        this.taskList = res.data
-      })
-    },
     // 同意
     openAgree(val) {
       this.operation = val
@@ -318,34 +284,28 @@ export default {
 </script>
 
 <style scoped>
-.wlInfo {
-  text-align: center;
-  font-size: 28px;
-  line-height: 90px;
+.listconadd {
+  height: calc(100vh - 0px) !important;
+}
+.spanOneWidth {
+  border-right: 0px !important;
+  width: 200px !important;
+}
+.addinputOne {
+  margin-left: 200px !important;
+}
+.spanTwoWidth {
+  width: 150px !important;
 }
-.tableStyle {
-  background-color: #FFFFFF;
-  display: flex;
-  justify-content: flex-start;
-  align-items: center;
-  border: 1px solid #dfe4ed;
-  height: 40px;
+.addinputTwo {
+  margin-left: 150px !important;
 }
-/deep/ .el-col-4 {
-  text-align: right;
-  float: left;
-  font-size: 14px;
-  color: #606266;
-  line-height: 40px !important;
-  font-weight: 600;
+.rowStyle {
+  border-left: 0px;
 }
-/deep/ .el-col-8 {
-  text-align: left;
-  float: left;
-  font-size: 14px;
-  color: #606266;
-  line-height: 40px !important;
-  font-weight: 600;
+.colStyle {
+  border-right: 0px !important;
+  border-bottom: 0px !important;
 }
 </style>
 
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit.vue
index 0385941b02..59a92ffd4d 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit.vue
@@ -15,79 +15,69 @@
       </div>
       <!--标题按钮部分结束-->
       <!--Start 新增修改部分-->
-      <div class="">
-        <div class="wlInfo"><span>车辆调价申请</span></div>
-        <el-form ref="form_obj" :model="formobj" :rules="rules">
-          <el-row>
-            <el-col :span="4">
-              <span>调价申请日期:</span>
+      <div class="listconadd">
+        <div class="titwu"><span>车辆调价申请</span></div>
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row class="rowStyle">
+            <el-col :span="12" class="colStyle">
+              <div class="span-sty spanOneWidth"><span>调价申请日期:</span></div>
+              <el-form-item><span class="addinputInfo addinputOne">{{ formobj.createTime }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
-              <span style="margin-left: 5px">{{ formobj.createTime }}</span>
-            </el-col>
-            <el-col :span="4">
-              <span>申请人:</span>
-            </el-col>
-            <el-col :span="8">
-              <span style="margin-left: 5px">{{ formobj.applyPeoName }}</span>
+            <el-col :span="12" class="colStyle">
+              <div class="span-sty spanOneWidth"><span>申请人:</span></div>
+              <el-form-item><span class="addinputInfo addinputOne">{{ formobj.applyPeoName }}</span></el-form-item>
             </el-col>
           </el-row>
-          <el-row>
-            <el-col :span="4" class="el-form-item-right">
-              <span>调价原因:</span>
-            </el-col>
-            <el-col :span="20">
-              <el-form-item>
-                <el-input v-model="formobj.modpriceReason" clearable style="width: 30%"/>
-              </el-form-item>
+          <el-row class="rowStyle">
+            <el-col :span="24" class="colStyle">
+              <div class="span-sty spanOneWidth"><span>调价原因:</span></div>
+              <el-form-item><el-input v-model="formobj.modpriceReason" clearable class="addinputw addinputOne" placeholder=""/></el-form-item>
             </el-col>
           </el-row>
-        </el-form>
-        <div class="tableStyle">
-          <div style="margin-left: 5px;font-weight: bold">车辆列表</div>
-          <div style="margin-left: 15px">
+          <div class="title">
+            <div>车辆列表</div>
             <el-button type="primary" size="mini" icon="el-icon-plus" @click="addCommodity()">选择车型</el-button>
           </div>
-        </div>
-        <el-table :key="tableKey" :data="formobj.baseModelModpriceModels" :index="index" border style="width: 100%">
-          <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-          <el-table-column fixed prop="name" label="操作" width="100px" align="center" header-align="center">
-            <template slot-scope="scope">
-              <el-button size="mini" type="danger" @click="dataDelete(scope.$index, formobj.baseModelModpriceModels[scope.$index])">删除
-              </el-button>
-            </template>
-          </el-table-column>
-          <el-table-column label="车型" align="left" header-align="center" width="250">
-            <template slot-scope="scope">
-              <span>{{ scope.row.vehicleAlias }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="常用配置" align="left" header-align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.configName }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="applyForDeposit" label="成本价" header-align="center" width="150">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.costPrice" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
-            </template>
-          </el-table-column>
-          <el-table-column label="现销售指导价(万元)" header-align="center" width="150">
-            <template slot-scope="scope">
-              <span>{{ scope.row.guidedPrice }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="价格增减数额" header-align="center" width="200">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.incOrDecInPrice" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
-            </template>
-          </el-table-column>
-          <el-table-column label="备注" header-align="center" width="200">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.remarks" placeholder="" class="addinputw" clearable/>
-            </template>
-          </el-table-column>
-        </el-table>
+          <el-table :key="tableKey" :data="formobj.baseModelModpriceModels" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column fixed prop="name" label="操作" width="100px" align="center" header-align="center">
+              <template slot-scope="scope">
+                <el-button size="mini" type="danger" @click="dataDelete(scope.$index, formobj.baseModelModpriceModels[scope.$index])">删除
+                </el-button>
+              </template>
+            </el-table-column>
+            <el-table-column label="车型" align="left" header-align="center" width="250">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vehicleAlias }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="常用配置" align="left" header-align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.configName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="applyForDeposit" label="成本价" header-align="center" width="150">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.costPrice" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
+              </template>
+            </el-table-column>
+            <el-table-column label="现销售指导价(万元)" header-align="center" width="150">
+              <template slot-scope="scope">
+                <span>{{ scope.row.guidedPrice }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="价格增减数额" header-align="center" width="200">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.incOrDecInPrice" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" header-align="center" width="200">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.remarks" placeholder="" class="addinputw" clearable/>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form>
       </div>
     </div>
     <!--End 添加修改部分-->
@@ -141,25 +131,11 @@ export default {
       params: {
         // 告诉父级页面，子页面的弹框高度。
         code: 2,
-        data: document.body.scrollHeight + 'px'
+        data: 450 + 'px'
       }
     }, '*')
   },
   methods: {
-    // 获取制单日期
-    newDate() {
-      let date = new Date()
-      let year = date.getFullYear() // 年
-      let month = date.getMonth() + 1 // 月
-      let day = date.getDate() // 日
-      if (month < 10) {
-        month = '0' + month
-      }
-      if (day < 10) {
-        day = '0' + day
-      }
-      this.formobj.createTime = year + '-' + month + '-' + day
-    },
     UpNumber(e) {
       e.target.value = e.target.value.replace(/[^\d.-]/g, '') // 清除“数字”和“.”"-"以外的字符
       e.target.value = e.target.value.replace(/^00/, '0.') // 开头不能有两个0
@@ -282,39 +258,29 @@ export default {
 </script>
 
 <style scoped>
-.wlInfo {
-  text-align: center;
-  font-size: 28px;
-  line-height: 90px;
+.listconadd {
+  height: calc(100vh - 0px) !important;
 }
-.tableStyle {
-  background-color: #FFFFFF;
+.title {
+  padding: 7px;
   display: flex;
-  justify-content: flex-start;
+  flex-direction: row;
+  justify-content: space-between;
   align-items: center;
-  border: 1px solid #dfe4ed;
-  height: 40px;
 }
-/deep/ .el-col-4 {
-  text-align: right;
-  float: left;
-  font-size: 14px;
-  color: #606266;
-  line-height: 40px !important;
-  font-weight: 600;
+.spanOneWidth {
+  border-right: 0px !important;
+  width: 200px !important;
 }
-/deep/ .el-col-8 {
-  text-align: left;
-  float: left;
-  font-size: 14px;
-  color: #606266;
-  line-height: 40px !important;
-  font-weight: 600;
+.addinputOne {
+  margin-left: 200px !important;
 }
-
-.icon {
-  color: #e84026;
-  margin-right: 4px;
+.rowStyle {
+  border-left: 0px;
+}
+.colStyle {
+  border-right: 0px !important;
+  border-bottom: 0px !important;
 }
 </style>
 
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojianYibanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojianYibanInfo.vue
index 49a13d7276..b508ef28e9 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojianYibanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojianYibanInfo.vue
@@ -10,96 +10,77 @@
           <el-button type="danger" @click="openRevoke()">撤 回</el-button>
         </div>
       </div>
-      <!--标题按钮部分结束-->
-      <!--Start 新增修改部分-->
       <div class="listconadd">
-        <div class="wlInfo"><span>车辆调价申请</span></div>
-        <el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top">
-          <el-row>
-            <el-col :span="4">
-              <span>调价申请日期:</span>
+        <div class="titwu"><span>车辆调价申请</span></div>
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row class="rowStyle">
+            <el-col :span="12" class="colStyle">
+              <div class="span-sty spanOneWidth"><span>调价申请日期:</span></div>
+              <el-form-item><span class="addinputInfo addinputOne">{{ formobj.createTime }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
-              <span style="margin-left: 5px">{{ formobj.createTime }}</span>
-            </el-col>
-            <el-col :span="4">
-              <span>申请人:</span>
-            </el-col>
-            <el-col :span="8">
-              <span style="margin-left: 5px">{{ formobj.applyPeoName }}</span>
+            <el-col :span="12" class="colStyle">
+              <div class="span-sty spanOneWidth"><span>申请人:</span></div>
+              <el-form-item><span class="addinputInfo addinputOne">{{ formobj.applyPeoName }}</span></el-form-item>
             </el-col>
           </el-row>
-          <el-row>
-            <el-col :span="4" class="el-form-item-right">
-              <span>调价原因:</span>
-            </el-col>
-            <el-col :span="20">
-              <el-form-item>
-                <span style="margin-left: 5px">{{ formobj.modpriceReason }}</span>
-              </el-form-item>
+          <el-row class="rowStyle">
+            <el-col :span="24" class="colStyle">
+              <div class="span-sty spanOneWidth"><span>调价原因:</span></div>
+              <el-form-item><span class="addinputInfo addinputOne">{{ formobj.modpriceReason }}</span></el-form-item>
             </el-col>
           </el-row>
+          <div class="title">
+            <div>车辆列表</div>
+          </div>
+          <el-table :key="tableKey" :data="formobj.baseModelModpriceModels" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" 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="常用配置" align="left" header-align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.configName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="applyForDeposit" label="成本价" align="center" width="150">
+              <template slot-scope="scope">
+                <span>{{ scope.row.costPrice }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="现销售指导价(元)" align="center" width="150">
+              <template slot-scope="scope">
+                <span>{{ scope.row.guidedPrice }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="价格增减数额" align="center" width="150">
+              <template slot-scope="scope">
+                <span>{{ scope.row.incOrDecInPrice }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" header-align="center" width="200">
+              <template slot-scope="scope">
+                <span>{{ scope.row.remarks }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
         </el-form>
-        <div class="tableStyle">
-          <div style="margin-left: 5px;font-weight: bold">车辆列表</div>
-        </div>
-        <el-table :key="tableKey" :data="formobj.baseModelModpriceModels" :index="index" border style="width: 100%">
-          <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-          <el-table-column label="车型" align="center" header-align="center" width="250">
-            <template slot-scope="scope">
-              <span>{{ scope.row.vehicleAlias }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="常用配置" align="left" header-align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.configName }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="applyForDeposit" label="成本价" header-align="center" align="center" width="150">
-            <template slot-scope="scope">
-              <span>{{ scope.row.costPrice }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="现销售指导价(万元)" header-align="center" align="center" width="150">
-            <template slot-scope="scope">
-              <span>{{ scope.row.guidedPrice }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="价格增减数额" header-align="center" align="center" width="200">
-            <template slot-scope="scope">
-              <span>{{ scope.row.incOrDecInPrice }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="备注" header-align="center" width="200">
-            <template slot-scope="scope">
-              <span>{{ scope.row.remarks }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
       </div>
     </div>
-    <!--End 添加修改部分-->
-    <span class="el-icon-picture-outline">流程图</span>
-    <flow :xmlData="xmlData" :taskData="taskList"></flow>
   </div>
 </template>
 
 <script>
 import req from '@/api/kucunguanli/price'
-import flow from '../../../baseoutsourcingapplication/workflow/flow'
 
 export default {
-  name: 'tiaojiaInfo',
-  components: {
-    flow
-  },
+  name: 'tiaojianYibanInfo',
   data() {
     return {
       dialogStatus: '',
       index: 0,
       tableKey: 0,
-      xmlData: '', // 模型xml数据
-      taskList: [],
       // 表单数据
       formobj: {},
       // 环节所需参数
@@ -129,9 +110,6 @@ export default {
     this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
     // 加载表单数据
     this.showInfo(obj.businessSid)
-    // 加载流程图相关的数据
-    this.getModelDetail(obj.deployId)
-    this.getFlowViewer(obj.instanceId)
   },
   mounted() {
     window.parent.postMessage({
@@ -139,7 +117,7 @@ export default {
       params: {
         // 告诉父级页面，子页面的弹框高度。
         code: 2,
-        data: document.body.scrollHeight + 'px'
+        data: 450 + 'px'
       }
     }, '*')
   },
@@ -151,19 +129,6 @@ export default {
         }
       })
     },
-    /** xml 文件 */
-    getModelDetail(deployId) {
-      // 发送请求，获取xml
-      req.readXml(deployId).then((res) => {
-        this.xmlData = res.data
-      })
-    },
-    // 已办环节的节点
-    getFlowViewer(procInsId) {
-      req.getFlowViewer(procInsId).then((res) => {
-        this.taskList = res.data
-      })
-    },
     /** 确认撤回任务 */
     openRevoke() {
       this.$confirm('是否确认执行撤回操作', '提示', {
@@ -205,34 +170,22 @@ export default {
 </script>
 
 <style scoped>
-.wlInfo {
-  text-align: center;
-  font-size: 28px;
-  line-height: 90px;
+.listconadd {
+  height: calc(100vh - 0px) !important;
+}
+.spanOneWidth {
+  border-right: 0px !important;
+  width: 200px !important;
 }
-.tableStyle {
-  background-color: #FFFFFF;
-  display: flex;
-  justify-content: flex-start;
-  align-items: center;
-  border: 1px solid #dfe4ed;
-  height: 40px;
+.addinputOne {
+  margin-left: 200px !important;
 }
-/deep/ .el-col-4 {
-  text-align: right;
-  float: left;
-  font-size: 14px;
-  color: #606266;
-  line-height: 40px !important;
-  font-weight: 600;
+.rowStyle {
+  border-left: 0px;
 }
-/deep/ .el-col-8 {
-  text-align: left;
-  float: left;
-  font-size: 14px;
-  color: #606266;
-  line-height: 40px !important;
-  font-weight: 600;
+.colStyle {
+  border-right: 0px !important;
+  border-bottom: 0px !important;
 }
 </style>