diff --git a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/changjiatuiku/changjiatuikuguanli/changjiatuikuAdd.vue b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/changjiatuiku/changjiatuikuguanli/changjiatuikuAdd.vue
index 6992d3053b..932de55a89 100644
--- a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/changjiatuiku/changjiatuikuguanli/changjiatuikuAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/changjiatuiku/changjiatuikuguanli/changjiatuikuAdd.vue
@@ -8,7 +8,6 @@
         <!--start 添加修改按钮-->
         <div>
           <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button>
-          <el-button type="primary" size="small" @click="confirm()">确认</el-button>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>
@@ -16,28 +15,38 @@
       <!--Start 新增修改部分-->
       <div class="listconadd">
         <div class="titwu"><span>厂家退库办理</span></div>
-        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
           <el-row class="rowStyle">
-            <el-col :span="12" class="colOneStyle">
-              <div class="span-sty spanOneWidth"><span>退库编号:</span></div>
-              <el-form-item><span class="addinputwInfo addinputwOne">{{ formobj.applyNo }}</span></el-form-item>
+            <el-col :span="4" class="tleftb colOneStyle">
+              <span>分公司:</span>
             </el-col>
-            <el-col :span="12" class="colOneStyle">
-              <div class="span-sty spanOneWidth"><span>操作人:</span></div>
-              <el-form-item><span class="addinputwInfo addinputwOne">{{ formobj.operatorName }}</span></el-form-item>
+            <el-col :span="8" class="colOneStyle">
+              <el-form-item><span>{{ createOrgName }}</span></el-form-item>
             </el-col>
-          </el-row>
-          <el-row class="rowStyle">
-            <el-col :span="24" class="colOneStyle">
-              <div class="span-sty spanOneWidth"><span>来源:</span></div>
-              <el-form-item><span class="addinputwInfo addinputwOne">{{ formobj.source }}</span></el-form-item>
+            <el-col :span="4" class="tleftb colOneStyle">
+              <span>操作人:</span>
+            </el-col>
+            <el-col :span="8" class="colOneStyle">
+              <el-form-item><span>{{ formobj.operatorName }}</span></el-form-item>
             </el-col>
           </el-row>
+<!--          <el-row class="rowStyle">-->
+<!--            <el-col :span="24" class="colOneStyle">-->
+<!--              <div class="span-sty spanOneWidth"><span>来源:</span></div>-->
+<!--              <el-form-item><span class="addinputwInfo addinputwOne">{{ formobj.source }}</span></el-form-item>-->
+<!--            </el-col>-->
+<!--          </el-row>-->
           <div class="title">
             <div>车辆列表</div>
           </div>
           <el-table :key="tableKey" :data="formobj.baseManufacturerRetwareVehs" :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="primary" @click="confirm(scope.row)">确认
+                </el-button>
+              </template>
+            </el-table-column>
             <el-table-column label="车架号" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.vinNo }}</span>
@@ -45,7 +54,7 @@
             </el-table-column>
             <el-table-column label="厂家审批结果" align="center">
               <template slot-scope="scope">
-                <el-select v-model="scope.row.manApprovalType" filterable placeholder="请选择" clearable>
+                <el-select v-model="scope.row.manApprovalType" filterable placeholder="请选择" clearable @change="changeManApprovalType($event, scope.row)">
                   <el-option v-for="item in manApprovalType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue">
                   </el-option>
                 </el-select>
@@ -53,7 +62,7 @@
             </el-table-column>
             <el-table-column prop="applyForDeposit" label="退款金额" header-align="center">
               <template slot-scope="scope">
-                <el-input v-model="scope.row.refundMoney" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
+                <el-input v-model="scope.row.refundMoney" :disabled="disabledRefundMoney" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
               </template>
             </el-table-column>
             <el-table-column label="厂家退款见证材料" align="center" width="230">
@@ -95,6 +104,7 @@
 <script>
 import req from '@/api/kucunguanli/changjiachuku'
 import upload_changjiatuku from '@/components/uploadFile/upload_changjiatuku'
+import { fetchBySid } from '@/api/cheliang/dictcommons'
 
 export default {
   name: 'changjiatuikuAdd',
@@ -107,8 +117,10 @@ export default {
       tableKey: 0,
       dialogImgVisible: false,
       dialogVisible: false,
+      disabledRefundMoney: false,
       dialogUrl: '',
       srcList: [],
+      createOrgName: '',
       manApprovalType_list: [
         {
           dictKey: 0,
@@ -144,7 +156,7 @@ export default {
         e.target.value = parseFloat(e.target.value)
       }
     },
-    showEdit(row, createOrgSid) {
+    showEdit(row) {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
@@ -153,7 +165,11 @@ export default {
         if (resp.success) {
           this.formobj = resp.data
           this.formobj.operatorName = window.sessionStorage.getItem('name')
-          this.formobj.createOrgSid = createOrgSid
+          fetchBySid(this.formobj.createOrgSid).then((res) => {
+            if (res.success) {
+              this.createOrgName = res.data.name
+            }
+          })
         }
       }).catch((e) => {
         this.formobj = {}
@@ -192,6 +208,15 @@ export default {
         }
       })
     },
+    changeManApprovalType(value, row) {
+      if (value === '成功') {
+        row.refundMoney = ''
+        this.disabledRefundMoney = false
+      } else {
+        row.refundMoney = 0
+        this.disabledRefundMoney = true
+      }
+    },
     saveOrUpdate() {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
@@ -212,8 +237,8 @@ export default {
         }
       })
     },
-    confirm() {
-      req.confirm(this.formobj).then((res) => {
+    confirm(row) {
+      req.confirm(row).then((res) => {
         if (res.success) {
           this.$message({
             showClose: true,
@@ -221,12 +246,6 @@ export default {
             message: '提交成功'
           })
           this.handleReturn('true')
-        } else {
-          this.$message({
-            showClose: true,
-            type: 'error',
-            message: '提交失败'
-          })
         }
       })
     },
@@ -248,17 +267,11 @@ export default {
 </script>
 
 <style scoped>
-.spanOneWidth {
-  width: 260px !important;
-  border-right: 0px !important;
-}
-.addinputwOne {
-  margin-left: 260px !important;
-}
 .rowStyle {
   border-left: 0px;
 }
 .colOneStyle {
+  padding: 0 5px !important;
   border-right: 0px !important;
   border-bottom: 0px !important;
 }
diff --git a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/changjiatuiku/changjiatuikuguanli/changjiatuikuInfo.vue b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/changjiatuiku/changjiatuikuguanli/changjiatuikuInfo.vue
index f53bb47493..06a43e0bcf 100644
--- a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/changjiatuiku/changjiatuikuguanli/changjiatuikuInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/changjiatuiku/changjiatuikuguanli/changjiatuikuInfo.vue
@@ -14,23 +14,27 @@
       <!--Start 新增修改部分-->
       <div class="listconadd">
         <div class="titwu"><span>厂家退库</span></div>
-        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
           <el-row class="rowStyle">
-            <el-col :span="12" class="colOneStyle">
-              <div class="span-sty spanOneWidth"><span>退库编号:</span></div>
-              <el-form-item><span class="addinputwInfo addinputwOne">{{ formobj.applyNo }}</span></el-form-item>
+            <el-col :span="4" class="tleftb colOneStyle">
+              <span>分公司:</span>
             </el-col>
-            <el-col :span="12" class="colOneStyle">
-              <div class="span-sty spanOneWidth"><span>操作人:</span></div>
-              <el-form-item><span class="addinputwInfo addinputwOne">{{ formobj.operatorName }}</span></el-form-item>
+            <el-col :span="8" class="colOneStyle">
+              <el-form-item><span>{{ createOrgName }}</span></el-form-item>
             </el-col>
-          </el-row>
-          <el-row class="rowStyle">
-            <el-col :span="24" class="colOneStyle">
-              <div class="span-sty spanOneWidth"><span>来源:</span></div>
-              <el-form-item><span class="addinputwInfo addinputwOne">{{ formobj.source }}</span></el-form-item>
+            <el-col :span="4" class="tleftb colOneStyle">
+              <span>操作人:</span>
+            </el-col>
+            <el-col :span="8" class="colOneStyle">
+              <el-form-item><span>{{ formobj.operatorName }}</span></el-form-item>
             </el-col>
           </el-row>
+<!--          <el-row class="rowStyle">-->
+<!--            <el-col :span="24" class="colOneStyle">-->
+<!--              <div class="span-sty spanOneWidth"><span>来源:</span></div>-->
+<!--              <el-form-item><span class="addinputwInfo addinputwOne">{{ formobj.source }}</span></el-form-item>-->
+<!--            </el-col>-->
+<!--          </el-row>-->
           <div class="title">
             <div>车辆列表</div>
           </div>
@@ -85,6 +89,7 @@
 
 <script>
 import req from '@/api/kucunguanli/changjiachuku'
+import { fetchBySid } from '@/api/cheliang/dictcommons'
 
 export default {
   name: 'changjiatuikuInfo',
@@ -96,6 +101,7 @@ export default {
       dialogVisible: false,
       dialogUrl: '',
       srcList: [],
+      createOrgName: '',
       // 表单数据
       formobj: {
         applyNo: '',
@@ -117,6 +123,11 @@ export default {
       req.fetchBySid(row.sid).then((resp) => {
         if (resp.success) {
           this.formobj = resp.data
+          fetchBySid(this.formobj.createOrgSid).then((res) => {
+            if (res.success) {
+              this.createOrgName = res.data.name
+            }
+          })
         }
       }).catch((e) => {
         this.formobj = {}
@@ -155,17 +166,11 @@ export default {
 </script>
 
 <style scoped>
-.spanOneWidth {
-  width: 260px !important;
-  border-right: 0px !important;
-}
-.addinputwOne {
-  margin-left: 260px !important;
-}
 .rowStyle {
   border-left: 0px;
 }
 .colOneStyle {
+  padding: 0 5px !important;
   border-right: 0px !important;
   border-bottom: 0px !important;
 }