From 6d8dcba48e27c08c30b770a7875470bac8777595 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 27 Jul 2022 10:04:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E8=B4=A6=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E3=80=81=E5=88=86=E5=85=AC=E5=8F=B8=E8=B0=83=E8=BD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/ruzhang/scmapplyinbound.js        |   8 +-
 .../src/api/supplychain/cheliangneigou.js     |   8 +
 .../components/uploadFile/upload_picture.vue  | 245 +++++++
 .../src/router/modules/codemenu.js            |  22 +-
 .../ruzhang/ruzhangguanli/ruzhangAdd.vue      | 617 ++++++++++++++----
 .../ruzhang/ruzhangguanli/ruzhangInfo.vue     | 350 ++++++----
 .../ruzhang/ruzhangguanli/ruzhangguanli.vue   | 204 +++---
 .../neigouDaiBanByBusinessDivisionInfo.vue    | 331 ++++++++++
 .../ruzhangguanli/ruzhangDaiBanInfo.vue       | 512 +++++++++++++++
 .../ruzhangguanli/ruzhangInfo.vue             | 497 --------------
 .../ruzhangguanli/ruzhangYiBanInfo.vue        | 396 +++++++++++
 11 files changed, 2319 insertions(+), 871 deletions(-)
 create mode 100644 anrui-scm/anrui-scm-ui/src/components/uploadFile/upload_picture.vue
 create mode 100644 anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByBusinessDivisionInfo.vue
 create mode 100644 anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue
 delete mode 100644 anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangInfo.vue
 create mode 100644 anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue

diff --git a/anrui-scm/anrui-scm-ui/src/api/ruzhang/scmapplyinbound.js b/anrui-scm/anrui-scm-ui/src/api/ruzhang/scmapplyinbound.js
index 0406e4ca4d..b9bc64522a 100644
--- a/anrui-scm/anrui-scm-ui/src/api/ruzhang/scmapplyinbound.js
+++ b/anrui-scm/anrui-scm-ui/src/api/ruzhang/scmapplyinbound.js
@@ -36,7 +36,7 @@ export default {
     })
   },
   // 代办任务同意办理
-  businessAgree: function(params) {
+  complete: function(params) {
     return request({
       url: '/scm/v1/scmapplyinbound/complete',
       method: 'post',
@@ -47,7 +47,7 @@ export default {
     })
   },
   // 代办任务驳回任务
-  rejectTask: function(params) {
+  reject: function(params) {
     return request({
       url: '/scm/v1/scmapplyinbound/reject',
       method: 'post',
@@ -58,7 +58,7 @@ export default {
     })
   },
   // 代办任务终止任务
-  breakTask: function(params) {
+  breakProcess: function(params) {
     return request({
       url: '/scm/v1/scmapplyinbound/breakProcess',
       method: 'post',
@@ -69,7 +69,7 @@ export default {
     })
   },
   // 代办任务撤回任务
-  revokeTask: function(params) {
+  revokeProcess: function(params) {
     return request({
       url: '/scm/v1/scmapplyinbound/revokeProcess',
       method: 'post',
diff --git a/anrui-scm/anrui-scm-ui/src/api/supplychain/cheliangneigou.js b/anrui-scm/anrui-scm-ui/src/api/supplychain/cheliangneigou.js
index 05265244db..31d4eb64d5 100644
--- a/anrui-scm/anrui-scm-ui/src/api/supplychain/cheliangneigou.js
+++ b/anrui-scm/anrui-scm-ui/src/api/supplychain/cheliangneigou.js
@@ -86,6 +86,14 @@ export default {
       data: params
     })
   },
+  // 流程审批（同意）--应对方转事业部
+  companyToDivisionOperate: function(params) {
+    return request({
+      url: '/base/v1/baseinternalpurchase/companyToDivisionOperate',
+      method: 'post',
+      data: params
+    })
+  },
   // 流程审批（驳回）
   reject: function(params) {
     return request({
diff --git a/anrui-scm/anrui-scm-ui/src/components/uploadFile/upload_picture.vue b/anrui-scm/anrui-scm-ui/src/components/uploadFile/upload_picture.vue
new file mode 100644
index 0000000000..fbdfe60fc0
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/components/uploadFile/upload_picture.vue
@@ -0,0 +1,245 @@
+<template>
+  <div>
+    <el-upload ref="imgUpload" v-loading="loadding" class="avatar-uploader" :headers="accessToken"
+               :action="uploadFile" accept=".jpg,.jpeg,.png,.bmp,.pdf,.JPG,.JPEG,.BMP" list-type="picture-card"
+               :file-list="files" :on-remove="removeImage" :on-preview="handlePictureCardPreview"
+               :on-progress="uploadProgrees"
+               :on-error="uploadError" :on-success="uploadImgSuccess_FuJian">
+      <i class="el-icon-plus avatar-uploader-icon"/>
+    </el-upload>
+    <el-dialog :visible.sync="dialogVisible" :append-to-body="true" title="查看图片">
+      <img width="100%" :src="dialogImageUrl" alt="">
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { uploadFile } from '@/api/portal/Upload.js'
+import { getStorage } from '@/utils/auth.js' //token
+import { mapGetters } from 'vuex'
+
+export default {
+  model: {
+    prop: 'name',
+    event: 'change'
+  },
+  props: {
+    placeholder: {
+      type: String,
+      default: ''
+    },
+    bucket: {
+      type: String,
+      default: 'abc'
+    },
+    // 长度
+    width: {
+      type: String,
+      default: '270px'
+    },
+    limit: {
+      type: Number,
+      default: 1
+    },
+    accept: {
+      type: String,
+      default:
+        '.jpg,.jpeg,.png,.JPG,.JPEG'
+    },
+    // 文件名称
+    name: {
+      type: Array,
+      required: true
+    },
+    uploadData: {
+      type: Object,
+      default: {}
+    }
+  },
+  data() {
+    return {
+      dialogImageUrl: '',
+      dialogVisible: false,
+      accessToken: null,
+      uploadFile: uploadFile,
+      fileList_FuJian: [],
+      enclosure: '',
+      file_add: '',
+      file_catch: '',
+      files: [],
+      files_list: [],
+      filedUrl: '',
+      // fileUrl: fileUrl,
+      // showpicture:false,
+      isview: false,
+      nameArr: '',
+      loadding: false,
+      stateName: ''
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'id',
+      'departmentCode',
+      'departmentLevel',
+      'departmentType',
+      'token'
+    ])
+  },
+  watch: {
+    name: {
+      deep: true,
+      immediate: true,
+      handler(newVal, oldVal) {
+        console.log('aaaa1', newVal)
+        this.files = newVal
+        // if (this.stateName = 'xunidingjinAdd') {
+        //   if (this.files.length > 1) {
+        //     this.files.splice(0, 1)
+        //   }
+        // }
+        console.log('aaaa2', this.files)
+      }
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.Init()
+    })
+  },
+  created() {
+    this.uploadFile = uploadFile // 接口
+    this.accessToken = {
+      token: getStorage()
+    }
+  },
+  methods: {
+    showImg(imgList) {
+      this.stateName = 'xunidingjinAdd'
+      this.files = imgList
+      console.log('回显图片', this.files)
+    },
+    view() {
+      // window.open(this.filedUrl)
+    },
+    // 页面第一次加载
+    Init() {
+      if (this.name !== undefined) {
+        this.files = []
+        for (var i = 0; i < this.name.length; i++) {
+          this.files.push({
+            name: this.name[i],
+            url: this.name[i]
+          })
+        }
+      }
+    },
+    // 上传方案--成功后执行
+    uploadImgSuccess_FuJian(response, file, fileList) {
+      console.log('您选择的file:', file)
+      if (file.response.code === '200') {
+        this.loadding = false
+        // 返显图片
+        this.filedUrl = this.fileUrl + file.response.data
+        // var uid = file.response.data
+        this.files.push({
+          name: file.response.data.sourceFileName,
+          url: file.response.data.fullUrl,
+          filePath: file.response.data.filePath,
+          size: file.response.data.size
+        })
+        this.$emit('change', this.files)
+        this.$emit('eett', this.files)
+      }
+    },
+
+    removeImage(file, ImageFileList) {
+      this.files.splice(this.files.indexOf(file), 1)
+      const imgFiles = []
+
+      this.files.forEach((o) => {
+        imgFiles.push(o.url)
+      })
+      this.$emit('fileChange', this.files)
+    },
+    handleRemove(file, fileList) {
+      console.log('file:' + JSON.stringify(file))
+      console.log('fileList:' + JSON.stringify(fileList))
+      this.enclosure = ''
+      // 1. 保存新增文件id(this.file_add)
+      this.getNewFileId(fileList)
+      // 2. 保存数据库读取的已有文件id(this.file_catch)
+      this.getCatchFileId(file)
+      // 3. 保存并拼接id
+      this.getFileId()
+      // 4. 返回拼接id
+      this.$emit('change', this.enclosure)
+    },
+    // 返回this.file_add(新上传文件的id拼接集合)
+    getNewFileId(fileList) {
+      // debugger
+      this.file_add = ''
+      for (var i = 0; i < fileList.length; i++) {
+        if (fileList[i].response && fileList[i].response.code === '200') {
+          this.file_add = this.file_add + fileList[i].response.data + ','
+        }
+      }
+      if (this.file_add !== '') {
+        this.file_add = this.file_add.substring(0, this.file_add.length - 1)
+      }
+      // console.log('1. this.file_add: ' + this.file_add)
+    },
+    // 返回this.file_catch（数库一寸照的文件的id的拼接集合）
+    getCatchFileId(file) {
+      for (var i = 0; i < this.files_list.length; i++) {
+        if (this.file_catch !== '') {
+          // 1. 检查当前删除的文件是否是修改文件列表里面的，如果是，将修改列表里去除此id
+          if (this.files_list[i].name === file.name) {
+            // 2. 拆开file_catch到fils_arry
+            var fils_arry = this.file_catch.split(',')
+            // 3. 从fils_arry去除 this.files_list[i].id
+            var arry = []
+            fils_arry.forEach((element) => {
+              // 不加载文件里面的
+              if (element !== this.files_list[i].id) {
+                arry.push(element)
+              }
+            })
+            // 4. 重新拼接成file_catch
+            this.file_catch = arry.join(',')
+          }
+        }
+      }
+      // console.log('2. this.file_catch:' + this.file_catch)
+    },
+    // 保存并拼接id
+    getFileId() {
+      // console.log('3. this.file_catch:' + this.file_catch + ',this.file_add:' + this.file_add)
+      if (this.file_catch !== '') {
+        if (this.file_add !== '') {
+          this.enclosure = this.file_catch + ',' + this.file_add
+        } else {
+          this.enclosure = this.file_catch
+        }
+      } else {
+        this.enclosure = this.file_add
+      }
+    },
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url
+      this.dialogVisible = true
+    },
+    // 上传失败
+    uploadError() {
+      this.loadding = false
+    },
+    uploadProgrees(event, file, fileList) {
+      if (Number(event.percent) > 0) {
+        this.loadding = true
+      }
+    }
+  }
+}
+</script>
+
+<style scoped></style>
diff --git a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
index c71807c893..25ee29a9c2 100644
--- a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
+++ b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
@@ -551,12 +551,19 @@ const codemenu = [
       import('@/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue'),
     name: 'ruzhangAdd'
   },
-  // 入账管理详情
+  // 入账管理（待办）详情
   {
-    path: '/ruzhangguanliFlow/ruzhangguanli/ruzhangInfo',
+    path: '/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo',
     component: () =>
-      import('@/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangInfo.vue'),
-    name: 'ruzhangInfo'
+      import('@/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue'),
+    name: 'ruzhangDaiBanInfo'
+  },
+  // 入账管理（已办）详情
+  {
+    path: '/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo',
+    component: () =>
+      import('@/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue'),
+    name: 'ruzhangYiBanInfo'
   },
   // 排产管理编辑
   {
@@ -621,6 +628,13 @@ const codemenu = [
       import('@/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByShunTingTypeValueInfo.vue'),
     name: 'neigouDaiBanByShunTingTypeValueInfo'
   },
+  // 车辆内购待办详情(应对方转事业部)
+  {
+    path: '/cheliangneigouFlow/neigouguanli/neigouDaiBanByBusinessDivisionInfo',
+    component: () =>
+      import('@/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByBusinessDivisionInfo.vue'),
+    name: 'neigouDaiBanByBusinessDivisionInfo'
+  },
   // 车辆内购待办详情
   {
     path: '/cheliangneigouFlow/neigouguanli/neigouDaiBanByVinNoInfo',
diff --git a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue
index 970afeb36d..245eee6fb9 100644
--- a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue
@@ -1,51 +1,150 @@
 <template>
   <div class="app-container">
     <div>
-      <!--标题按钮部分开始-->
       <div class="tab-header webtop">
-        <!--标题-->
         <div>{{ viewTitle }}</div>
-        <!--start 添加修改按钮-->
         <div>
           <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveEdit()">保存</el-button>
           <el-button type="primary" size="small" @click="submitVehicleApply()">提交</el-button>
-          <el-button type="info" size="small" @click="handleReturn()">返回</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</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 class="lineone">
-            <el-col :span="3" class="el-form-item-right"><el-form-item label="申请编号:" /></el-col>
+        <div class="titwu"><span>车辆入账申请单</span></div>
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
+          <el-row class="rowStyle">
+            <el-col :span="20" class="colOneStyle"></el-col>
+            <el-col :span="4" class="tleftb colOneStyle">
+              <span style="font-size: 16px">金额单位：元</span>
+            </el-col>
+          </el-row>
+          <el-row style="border-top: 1px solid #E0E3EB">
+            <el-col :span="3" class="tleftb"><span>分公司</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.useOrgName }}</el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb"><span>申请日期</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.applicationDate }}</el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb"><span>申请人</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.applicationName }}</el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>采购订单编号</span></el-col>
+            <el-col :span="21">
+              <el-form-item>{{ formobj.purchaseOrderNo }}</el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>车型</span></el-col>
+            <el-col :span="21">
+              <el-form-item>{{ formobj.modelName }}</el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>常用配置</span></el-col>
+            <el-col :span="21">
+              <el-form-item>{{ formobj.configName }}</el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>厂家合同价</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.contractPrice }}</el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb"><span>其中上装价格</span></el-col>
+            <el-col :span="5">
+              <el-form-item><el-input v-model="formobj.amongSzPrice" @keyup.native="UpNumber" @keydown.native="UpNumber" placeholder="" clearable class="addinputw"/></el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb"><span>上装价格计算依据</span></el-col>
+            <el-col :span="5">
+              <el-form-item><el-input v-model="formobj.szPriceCalBasis" placeholder="" clearable class="addinputw"/></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8" class="tcenterb"><span>其中含运费</span></el-col>
+            <el-col :span="3" class="tleftb"><span>一次运费</span></el-col>
+            <el-col :span="5">
+              <el-form-item><el-input @input="inputOnceFreight" v-model="formobj.onceFreight" placeholder="" clearable @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw"/></el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb"><span>二次运费</span></el-col>
+            <el-col :span="5">
+              <el-form-item><el-input @input="inputSecondaryFreight" v-model="formobj.secondaryFreight" placeholder="" clearable @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw"/></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">
+            <div>政策详情(含签单折让、开票下浮等)</div>
+            <el-checkbox @change="changeFreight" v-model="freightChecked"><span style="color: #FFFFFF">扣减运费</span></el-checkbox>
+          </div>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>政策1</span></el-col>
+            <el-col :span="5">
+              <el-form-item><el-input v-model="formobj.policyOne" placeholder="" clearable class="addinputw"/></el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb"><span>可享受金额</span></el-col>
+            <el-col :span="5">
+              <el-form-item><el-input @input="inputEligibleAmountOne" @keyup.native="UpNumber" @keydown.native="UpNumber" v-model="formobj.eligibleAmountOne" placeholder="" clearable class="addinputw"/></el-form-item>
+            </el-col>
+            <el-col :span="8" class="tcenterb"><span>计算政策2时:<el-checkbox @change="changePolicyOne" style="padding-left: 5px" v-model="policyOneChecked">扣减政策1</el-checkbox></span><span style="padding-left: 15px">计算政策3时:<el-checkbox @change="changePolicyTwo" style="padding-left: 5px" v-model="policyTwoChecked">扣减政策1</el-checkbox><el-checkbox @change="changePolicyThree" v-model="policyThreeChecked">扣减政策2</el-checkbox></span></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>政策2</span></el-col>
             <el-col :span="5">
-              <el-form-item><el-input v-model="formobj.applicationCode" readonly /></el-form-item>
+              <el-form-item><el-input v-model="formobj.policyTwo" placeholder="" clearable class="addinputw"/></el-form-item>
             </el-col>
-            <el-col :span="3" class="el-form-item-right"><el-form-item label="采购订单编号:" /></el-col>
+            <el-col :span="3" class="tleftb"><span>可享受比例（%）</span></el-col>
             <el-col :span="5">
-              <el-form-item><el-input v-model="formobj.purchaseOrderNo" readonly /></el-form-item>
+              <el-form-item><el-input @input="inputEligibleProportionTwo" v-model="formobj.eligibleProportionTwo" placeholder="" clearable class="addinputw"/></el-form-item>
             </el-col>
-            <el-col :span="3" class="el-form-item-right"><el-form-item label="申请人:" /></el-col>
+            <el-col :span="3" class="tleftb"><span>对应金额</span></el-col>
             <el-col :span="5">
-              <el-form-item><el-input v-model="formobj.applicationName" readonly /></el-form-item>
+              <el-form-item>{{ formobj.corrMoneyTwo }}</el-form-item>
             </el-col>
           </el-row>
-          <el-row class="linetwo">
-            <el-col :span="3" class="el-form-item-right"><el-form-item label="车型:" /></el-col>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>政策3</span></el-col>
+            <el-col :span="5">
+              <el-form-item><el-input v-model="formobj.policyThree" placeholder="" clearable class="addinputw"/></el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb"><span>可享受比例（%）</span></el-col>
+            <el-col :span="5">
+              <el-form-item><el-input @input="inputEligibleProportionThree" v-model="formobj.eligibleProportionThree" placeholder="" clearable class="addinputw"/></el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb"><span>对应金额</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.corrMoneyThree }}</el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>金额合计</span></el-col>
+            <el-col :span="5">
+              <el-form-item><el-input v-model="formobj.moneyCount" placeholder="" clearable class="addinputw"/></el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb"><span>政策备注</span></el-col>
+            <el-col :span="13">
+              <el-form-item><el-input v-model="formobj.policyRemarks" placeholder="" clearable class="addinputw"/></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>厂家政策截图</span></el-col>
             <el-col :span="21">
-              <el-form-item><el-input v-model="formobj.modelName" readonly /></el-form-item>
+              <upload_picture ref="imgUpload" v-model="imgList" bucket="map" :upload-data="{type:'0001'}"/>
             </el-col>
           </el-row>
-          <el-row class="linetwo">
-            <el-col :span="3" class="el-form-item-right"><el-form-item label="常用配置:" /></el-col>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>厂家结算价</span></el-col>
             <el-col :span="21">
-              <el-form-item><el-input v-model="formobj.configName" readonly /></el-form-item>
+              <el-form-item>{{ inputMoneyCount() }}</el-form-item>
             </el-col>
           </el-row>
-          <div class="tableStyle"><div style="margin-left: 5px;font-weight: bold">车辆列表</div></div>
+          <div class="title">
+            <div>车辆列表</div>
+          </div>
           <el-table :key="tableKey" :data="formobj.vehicleList" :index="index" border style="width: 100%">
-            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center" />
+            <el-table-column fixed width="60px" label="序号" type="index" :index="index + 1" align="center" />
             <el-table-column label="车架号" align="left" header-align="center">
               <template slot-scope="scope" prop="vehicleName">
                 <el-input v-model="scope.row.vinNo" placeholder="" class="addinputw" clearable />
@@ -57,125 +156,371 @@
               </template>
             </el-table-column>
           </el-table>
-          <el-row style="margin-top: 10px">
-            <el-col>
-              <el-col :span="3" class="el-form-item-right"><el-form-item label="厂家发车日期:" /></el-col>
-              <el-col :span="21">
-                <el-form-item><el-date-picker v-model="formobj.departureDate" value-format="yyyy-MM-dd" clearable type="date" placeholder="开始日期" /></el-form-item>
-              </el-col>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>厂家入库日期</span></el-col>
+            <el-col :span="9">
+              <el-form-item><el-date-picker value-format="yyyy-MM-dd" v-model="formobj.priceDate" clearable type="date" placeholder="开始日期"/></el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb"><span>厂家发车日期</span></el-col>
+            <el-col :span="9">
+              <el-form-item><el-date-picker value-format="yyyy-MM-dd" v-model="formobj.departureDate" clearable type="date" placeholder="开始日期"/></el-form-item>
             </el-col>
           </el-row>
-          <el-row class="linethree">
-            <el-col :span="3" class="el-form-item-right"><el-form-item label="备注:" /></el-col>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>备注</span></el-col>
             <el-col :span="21">
-              <el-form-item><el-input v-model="formobj.remarks" clearable /></el-form-item>
+              <el-form-item><el-input v-model="formobj.remarks" placeholder="" clearable class="addinputw"/></el-form-item>
             </el-col>
           </el-row>
         </el-form>
       </div>
     </div>
-    <!--End 添加修改部分-->
   </div>
 </template>
 
 <script>
 import req from '@/api/ruzhang/scmapplyinbound'
+import upload_picture from '@/components/uploadFile/upload_picture'
+import { getPathSidByUserSid, fetchBySid } from '@/api/cheliang/dictcommons'
 export default {
   name: 'RuzhangAdd',
+  components: {
+    upload_picture
+  },
   data() {
     return {
       viewTitle: '',
       index: 0,
       tableKey: 0,
+      freightChecked: false, // 扣减运费
+      policyOneChecked: false, // 计算政策2： 扣减政策1
+      policyTwoChecked: false, // 计算政策3： 扣减政策1
+      policyThreeChecked: false, // 计算政策3： 扣减政策2
+      imgList: [],
       // 表单数据
       formobj: {
-        sid: '', // 一条数据的sid
-        userSid: window.sessionStorage.getItem('userSid'), // 用户人sid
-        orgSidPath: window.sessionStorage.getItem('orgSidPath'),
-        staffSid: window.sessionStorage.getItem('staffSid'),
-        applicationCode: '', // 申请编号
+        amongSzPrice: '',
+        applicationCode: '',
+        applicationDate: '',
+        applicationName: '',
+        applicationSid: '',
         configName: '',
+        configSid: '',
+        contractPrice: '',
+        corrMoneyThree: '',
+        corrMoneyTwo: '',
+        costPrice: '',
         departureDate: '',
+        eligibleAmountOne: '',
+        eligibleProportionThree: '',
+        eligibleProportionTwo: '',
+        insideCode: '',
         modelName: '',
         modelSid: '',
+        moneyCount: '',
+        nodeState: '',
+        num: '',
+        onceFreight: '',
+        policyOne: '',
+        policyRemarks: '',
+        policyThree: '',
+        policyTwo: '',
+        priceDate: '',
         purchaseOrderNo: '',
-        remarks: '', // 备注
-        vehicleOrderSid: '',
-        taskId: '',
+        remarks: '',
+        secondaryFreight: '',
+        userSid: '',
+        useOrgName: '',
+        useOrgSid: '',
+        deductionFreight: '',
+        deductionPolicyThreeOne: '',
+        deductionPolicyThreeTwo: '',
+        deductionPolicyTwoOne: '',
+        scmFiles: [],
         vehicleList: [],
-        businessSid:'',
-        instanceId: ''
+        vehicleOrderSid: ''
       },
       rules: {},
       submitdisabled: false
     }
   },
   methods: {
+    init() {
+      getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => {
+        if (resp.success) {
+          this.formobj.useOrgSid = resp.data
+          fetchBySid(this.formobj.useOrgSid).then((res) => {
+            if (res.success) {
+              this.formobj.useOrgName = res.data.name
+            }
+          })
+        }
+      })
+    },
+    UpNumber(e) {
+      e.target.value = e.target.value.replace(/[^\d]/g, '') // 清除“数字”和“.”"-"以外的字符
+    },
+    inputOnceFreight() {
+      this.inputEligibleProportionTwo()
+      this.inputEligibleProportionThree()
+    },
+    inputSecondaryFreight() {
+      this.inputEligibleProportionTwo()
+      this.inputEligibleProportionThree()
+    },
+    changeFreight() {
+      this.inputEligibleProportionTwo()
+      this.inputEligibleProportionThree()
+    },
+    changePolicyOne() {
+      this.inputEligibleProportionTwo()
+      this.inputEligibleProportionThree()
+    },
+    changePolicyTwo() {
+      this.inputEligibleProportionTwo()
+      this.inputEligibleProportionThree()
+    },
+    changePolicyThree() {
+      this.inputEligibleProportionTwo()
+      this.inputEligibleProportionThree()
+    },
+    inputEligibleAmountOne() {
+      if (this.formobj.eligibleAmountOne !== '') {
+        this.inputEligibleProportionTwo()
+        this.inputEligibleProportionThree()
+      } else {
+        this.formobj.moneyCount = 0
+        this.inputEligibleProportionTwo()
+        this.inputEligibleProportionThree()
+      }
+    },
+    inputEligibleProportionTwo() {
+      if (this.formobj.eligibleProportionTwo !== '') {
+        if (this.policyOneChecked) {
+          if (this.freightChecked) {
+            if (this.formobj.onceFreight !== '' && this.formobj.secondaryFreight !== '') {
+              this.formobj.corrMoneyTwo = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.onceFreight) - parseFloat(this.formobj.secondaryFreight) - parseFloat(this.formobj.eligibleAmountOne)), (parseFloat(this.formobj.eligibleProportionTwo) / 100))
+            } else if (this.formobj.onceFreight !== '' && this.formobj.secondaryFreight === '') {
+              this.formobj.corrMoneyTwo = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.onceFreight) - parseFloat(this.formobj.eligibleAmountOne)), (parseFloat(this.formobj.eligibleProportionTwo) / 100))
+            } else if (this.formobj.onceFreight === '' && this.formobj.secondaryFreight !== '') {
+              this.formobj.corrMoneyTwo = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.secondaryFreight) - parseFloat(this.formobj.eligibleAmountOne)), (parseFloat(this.formobj.eligibleProportionTwo) / 100))
+            } else {
+              this.formobj.corrMoneyTwo = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.eligibleAmountOne)), (parseFloat(this.formobj.eligibleProportionTwo) / 100))
+            }
+          } else {
+            this.formobj.corrMoneyTwo = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.eligibleAmountOne)), (parseFloat(this.formobj.eligibleProportionTwo) / 100))
+          }
+        } else {
+          if (this.freightChecked) {
+            if (this.formobj.onceFreight !== '' && this.formobj.secondaryFreight !== '') {
+              this.formobj.corrMoneyTwo = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.onceFreight) - parseFloat(this.formobj.secondaryFreight)), (parseFloat(this.formobj.eligibleProportionTwo) / 100))
+            } else if (this.formobj.onceFreight !== '' && this.formobj.secondaryFreight === '') {
+              this.formobj.corrMoneyTwo = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.onceFreight)), (parseFloat(this.formobj.eligibleProportionTwo) / 100))
+            } else if (this.formobj.onceFreight === '' && this.formobj.secondaryFreight !== '') {
+              this.formobj.corrMoneyTwo = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.secondaryFreight)), (parseFloat(this.formobj.eligibleProportionTwo) / 100))
+            } else {
+              this.formobj.corrMoneyTwo = this.multiplication(parseFloat(this.formobj.contractPrice), (parseFloat(this.formobj.eligibleProportionTwo) / 100))
+            }
+          } else {
+            this.formobj.corrMoneyTwo = this.multiplication(parseFloat(this.formobj.contractPrice), (parseFloat(this.formobj.eligibleProportionTwo) / 100))
+          }
+        }
+        this.formobj.moneyCount = parseFloat(this.formobj.eligibleAmountOne) + parseFloat(this.formobj.corrMoneyTwo) + parseFloat(this.formobj.corrMoneyThree)
+      } else {
+        this.formobj.corrMoneyTwo = 0
+      }
+      return this.formobj.corrMoneyTwo
+    },
+    inputEligibleProportionThree() {
+      if (this.formobj.eligibleProportionThree !== '') {
+        if (this.policyTwoChecked && this.policyThreeChecked) {
+          if (this.freightChecked) {
+            if (this.formobj.onceFreight !== '' && this.formobj.secondaryFreight !== '') {
+              this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.onceFreight) - parseFloat(this.formobj.secondaryFreight) - parseFloat(this.formobj.eligibleAmountOne) - parseFloat(this.formobj.corrMoneyTwo)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
+            } else if (this.formobj.onceFreight !== '' && this.formobj.secondaryFreight === '') {
+              this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.onceFreight) - parseFloat(this.formobj.eligibleAmountOne) - parseFloat(this.formobj.corrMoneyTwo)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
+            } else if (this.formobj.onceFreight === '' && this.formobj.secondaryFreight !== '') {
+              this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.secondaryFreight) - parseFloat(this.formobj.eligibleAmountOne) - parseFloat(this.formobj.corrMoneyTwo)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
+            } else {
+              this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.eligibleAmountOne) - parseFloat(this.formobj.corrMoneyTwo)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
+            }
+          } else {
+            this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.eligibleAmountOne) - parseFloat(this.formobj.corrMoneyTwo)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
+          }
+        } else if (this.policyTwoChecked && !this.policyThreeChecked) {
+          if (this.freightChecked) {
+            if (this.formobj.onceFreight !== '' && this.formobj.secondaryFreight !== '') {
+              this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.onceFreight) - parseFloat(this.formobj.secondaryFreight) - parseFloat(this.formobj.eligibleAmountOne)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
+            } else if (this.formobj.onceFreight !== '' && this.formobj.secondaryFreight === '') {
+              this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.onceFreight) - parseFloat(this.formobj.eligibleAmountOne)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
+            } else if (this.formobj.onceFreight === '' && this.formobj.secondaryFreight !== '') {
+              this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.secondaryFreight) - parseFloat(this.formobj.eligibleAmountOne)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
+            } else {
+              this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.eligibleAmountOne)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
+            }
+          } else {
+            this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.eligibleAmountOne) - parseFloat(this.formobj.corrMoneyTwo)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
+          }
+        } else if (!this.policyTwoChecked && this.policyThreeChecked) {
+          if (this.freightChecked) {
+            if (this.policyOneChecked) {
+              if (this.formobj.onceFreight !== '' && this.formobj.secondaryFreight !== '') {
+                this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.onceFreight) - parseFloat(this.formobj.secondaryFreight) - parseFloat(this.formobj.corrMoneyTwo)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
+              } else if (this.formobj.onceFreight !== '' && this.formobj.secondaryFreight === '') {
+                this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.onceFreight) - parseFloat(this.formobj.corrMoneyTwo)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
+              } else if (this.formobj.onceFreight === '' && this.formobj.secondaryFreight !== '') {
+                this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.secondaryFreight) - parseFloat(this.formobj.corrMoneyTwo)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
+              } else {
+                this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.corrMoneyTwo)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
+              }
+            } else {
+              this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.corrMoneyTwo)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
+            }
+          } else {
+            this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.corrMoneyTwo)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
+          }
+        } else {
+          if (this.freightChecked) {
+            if (this.formobj.onceFreight !== '' && this.formobj.secondaryFreight !== '') {
+              this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.onceFreight) - parseFloat(this.formobj.secondaryFreight)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
+            } else if (this.formobj.onceFreight !== '' && this.formobj.secondaryFreight === '') {
+              this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.onceFreight)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
+            } else if (this.formobj.onceFreight === '' && this.formobj.secondaryFreight !== '') {
+              this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.secondaryFreight)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
+            } else {
+              this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
+            }
+          } else {
+            this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
+          }
+        }
+        this.formobj.moneyCount = parseFloat(this.formobj.eligibleAmountOne) + parseFloat(this.formobj.corrMoneyTwo) + parseFloat(this.formobj.corrMoneyThree)
+      } else {
+        this.formobj.corrMoneyThree = 0
+      }
+      return this.formobj.corrMoneyThree
+    },
+    inputMoneyCount() {
+      if (this.formobj.moneyCount === '') {
+        this.formobj.moneyCount = 0
+      }
+      this.formobj.costPrice = parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.moneyCount)
+      return this.formobj.costPrice
+    },
+    multiplication(arg1, arg2) {
+      var m = 0
+      var s1 = arg1.toString()
+      var s2 = arg2.toString()
+      try {
+        m += s1.split('.')[1].length
+      } catch (e) {}
+      try {
+        m += s2.split('.')[1].length
+      } catch (e) {}
+      return Number(s1.replace('.', '')) * Number(s2.replace('.', '')) / Math.pow(10, m)
+    },
     showEdit(sid, row) {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
       this.viewTitle = '【编辑】入账单'
       console.log('编辑回显', sid, row)
-      req
-        .fetchBySid(sid)
-        .then(resp => {
-          const data = resp.data
-          this.formobj.applicationSid = data.applicationSid
-          this.formobj.applicationName = data.applicationName
-          this.formobj.applicationCode = data.applicationCode
-          this.formobj.remarks = data.remarks
-          this.formobj.sid = sid
-          this.formobj.businessSid = sid
-          this.formobj.configName = data.configName
-          this.formobj.departureDate = data.departureDate
-          this.formobj.modelName = data.modelName
-          this.formobj.modelSid = data.modelSid
-          this.formobj.purchaseOrderNo = data.purchaseOrderNo
-          this.formobj.vehicleOrderSid = data.vehicleOrderSid
-          this.formobj.taskId = data.taskId
-          if (data.inboundVehicleList.length > 0) {
-            data.inboundVehicleList.forEach(e => {
-              this.formobj.vehicleList.push({
-                applySid: e.applySid,
-                remarks: e.remarks,
-                modelSid: e.modelSid,
-                sid: e.sid,
-                vinNo: e.vinNo
-              })
+      req.fetchBySid(sid).then(resp => {
+        const data = resp.data
+        this.formobj = data
+        this.formobj.userSid = window.sessionStorage.getItem('userSid')
+        if (this.formobj.scmFiles.length > 0) {
+          this.formobj.scmFiles.forEach((e) => {
+            this.imgList.push({
+              name: e.fileName,
+              filePath: e.filePath,
+              size: e.fileSize,
+              url: e.filePath
             })
-          }
-          // else {
-          //   for (var i = 0; i < row[0].vehicleNum; i++) {
-          //     this.formobj.vehicleList.push({
-          //       applySid: '',
-          //       remarks: '',
-          //       modelSid: this.formobj.modelSid,
-          //       sid: '',
-          //       vinNo: ''
-          //     })
-          //   }
-          // }
-        })
-        .catch(e => {
-          this.formobj = row
+          })
+        }
+        if (this.formobj.deductionFreight === '0') {
+          this.freightChecked = true
+        } else {
+          this.freightChecked = false
+        }
+        if (this.formobj.deductionPolicyTwoOne === '0') {
+          this.policyOneChecked = true
+        } else {
+          this.policyOneChecked = false
+        }
+        if (this.formobj.deductionPolicyTwoOne === '0') {
+          this.policyTwoChecked = true
+        } else {
+          this.policyTwoChecked = false
+        }
+        if (this.formobj.deductionPolicyThreeTwo === '0') {
+          this.policyThreeChecked = true
+        } else {
+          this.policyThreeChecked = false
+        }
+        this.$nextTick(() => {
+          this.init()
         })
+      }).catch(e => {
+        this.formobj = row
+      })
+    },
+    getUrl() {
+      if (this.imgList.length > 0) {
+        const aa = []
+        for (var i = 0; i < this.imgList.length; i++) {
+          aa.push({
+            attachType: '',
+            fileName: this.imgList[i].name,
+            filePath: this.imgList[i].filePath,
+            fileSize: this.imgList[i].size,
+            fileType: this.imgList[i].name.substr(this.imgList[i].name.lastIndexOf('.')),
+            linkSid: '',
+            name: window.sessionStorage.getItem('name'),
+            sid: ''
+          })
+        }
+        this.formobj.scmFiles = aa
+      }
     },
     saveEdit() {
-      console.log(this.formobj, 636363)
+      this.getUrl()
+      if (this.formobj.departureDate === '') {
+        alert('厂家发车日期不能为空!')
+        return
+      }
+      if (this.freightChecked) {
+        this.formobj.deductionFreight = 0
+      } else {
+        this.formobj.deductionFreight = 1
+      }
+      if (this.policyOneChecked) {
+        this.formobj.deductionPolicyTwoOne = 0
+      } else {
+        this.formobj.deductionPolicyTwoOne = 1
+      }
+      if (this.policyTwoChecked) {
+        this.formobj.deductionPolicyThreeOne = 0
+      } else {
+        this.formobj.deductionPolicyThreeOne = 1
+      }
+      if (this.policyThreeChecked) {
+        this.formobj.deductionPolicyThreeTwo = 0
+      } else {
+        this.formobj.deductionPolicyThreeTwo = 1
+      }
       this.$refs['form_obj'].validate(valid => {
         if (valid) {
           this.submitdisabled = true
-          req
-            .saveOrUpdate(this.formobj)
-            .then(resp => {
+          req.saveOrUpdate(this.formobj).then(resp => {
               this.submitdisabled = false
-             /* this.$message({
-                showClose: true,
-                type: 'success',
-                message: resp.msg
-              })*/
-              if(resp.success){
+              /* this.$message({
+                 showClose: true,
+                 type: 'success',
+                 message: resp.msg
+               })*/
+              if (resp.success) {
                 this.handleReturn('true')
               }
             })
@@ -188,13 +533,33 @@ export default {
       })
     },
     submitVehicleApply() {
-      if(this.formobj.departureDate===''){
-        alert('厂家发车日期不能为空');
-        return ;
+      this.getUrl()
+      if (this.formobj.departureDate === '') {
+        alert('厂家发车日期不能为空!')
+        return
+      }
+      if (this.freightChecked) {
+        this.formobj.deductionFreight = 0
+      } else {
+        this.formobj.deductionFreight = 1
+      }
+      if (this.policyOneChecked) {
+        this.formobj.deductionPolicyTwoOne = 0
+      } else {
+        this.formobj.deductionPolicyTwoOne = 1
+      }
+      if (this.policyTwoChecked) {
+        this.formobj.deductionPolicyThreeOne = 0
+      } else {
+        this.formobj.deductionPolicyThreeOne = 1
+      }
+      if (this.policyThreeChecked) {
+        this.formobj.deductionPolicyThreeTwo = 0
+      } else {
+        this.formobj.deductionPolicyThreeTwo = 1
       }
       req.submitVehicleApply(this.formobj).then(res => {
-        console.log(res.code, res.success)
-        if (res.code === '200' && res.success) {
+        if (res.success) {
           this.$message({
             showClose: true,
             type: 'success',
@@ -213,10 +578,8 @@ export default {
     // 返回（===既判断又赋值）
     handleReturn(isreload) {
       if (isreload === 'true') this.$emit('reloadlist')
-      this.formobj.departureDate = ''
-      this.formobj.remarks = '' // 备注
-      this.formobj.vehicleList = []
       this.$refs['form_obj'].resetFields()
+      this.imgList = []
       this.$emit('doback')
     }
   }
@@ -224,42 +587,26 @@ export default {
 </script>
 
 <style scoped>
-.wlInfo {
-  text-align: center;
-  font-size: 28px;
-  line-height: 90px;
-}
-.lineone {
-  border-bottom: 2px solid #e0e3eb;
-}
-.lineone .el-form-item {
-  margin-bottom: -10px;
-}
-.lineone >>> .el-input__inner {
-  border: 0;
-}
-.linetwo {
-  margin-top: 10px;
-}
-.linetwo .el-form-item {
-  margin-bottom: 0px !important;
+.title {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
 }
-.linetwo >>> .el-input__inner {
-  border: 0;
+.tcenterb {
+  text-align: center;
+  font-size: 14px;
+  color: #606266;
+  line-height: 40px !important;
+  font-weight: 600;
 }
-.linethree .el-form-item {
-  margin-bottom: 0px !important;
+.rowStyle {
+  border-left: 0px;
 }
-.tableStyle {
-  background-color: #ffffff;
-  display: flex;
-  justify-content: flex-start;
-  align-items: center;
-  border: 1px solid #dfe4ed;
-  height: 40px;
+.colOneStyle {
+  border-right: 0px !important;
+  border-bottom: 0px !important;
 }
-.el-form-item-right {
-  /* padding: 0 10px 0 0; */
-  text-align: right;
+.freight {
+  color: #FFFFFF;
 }
 </style>
diff --git a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue
index 59e7042f45..2071d26fe1 100644
--- a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue
@@ -1,134 +1,247 @@
 <template>
   <div class="app-container">
     <div>
-      <!--标题按钮部分开始-->
       <div class="tab-header webtop">
-        <!--标题-->
         <div>{{ viewTitle }}</div>
-        <!--start 添加修改按钮-->
         <div>
-          <el-button type="info" size="small" @click="handleReturn()">返回</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</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 class="lineone">
-            <el-col :span="3" class="el-form-item-right">
-              <el-form-item label="申请编号:"></el-form-item>
+        <div class="titwu"><span>车辆入账申请单</span></div>
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
+          <el-row class="rowStyle">
+            <el-col :span="20" class="colOneStyle"></el-col>
+            <el-col :span="4" class="tleftb colOneStyle">
+              <span style="font-size: 16px">金额单位：元</span>
             </el-col>
+          </el-row>
+          <el-row style="border-top: 1px solid #E0E3EB">
+            <el-col :span="3" class="tleftb"><span>分公司</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.useOrgName }}</el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb"><span>申请日期</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.applicationDate }}</el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb"><span>申请人</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.applicationName }}</el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>采购订单编号</span></el-col>
+            <el-col :span="21">
+              <el-form-item>{{ formobj.purchaseOrderNo }}</el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>车型</span></el-col>
+            <el-col :span="21">
+              <el-form-item>{{ formobj.modelName }}</el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>常用配置</span></el-col>
+            <el-col :span="21">
+              <el-form-item>{{ formobj.configName }}</el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>厂家合同价</span></el-col>
             <el-col :span="5">
-              <el-form-item>
-                <el-input v-model="formobj.applicationCode" readonly/>
-              </el-form-item>
+              <el-form-item>{{ formobj.contractPrice }}</el-form-item>
             </el-col>
-            <el-col :span="3" class="el-form-item-right">
-              <el-form-item label="采购订单编号:"></el-form-item>
+            <el-col :span="3" class="tleftb"><span>其中上装价格</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.amongSzPrice }}</el-form-item>
             </el-col>
+            <el-col :span="3" class="tleftb"><span>上装价格计算依据</span></el-col>
             <el-col :span="5">
-              <el-form-item>
-                <el-input v-model="formobj.purchaseOrderNo" readonly/>
-              </el-form-item>
+              <el-form-item>{{ formobj.szPriceCalBasis }}</el-form-item>
             </el-col>
-            <el-col :span="3" class="el-form-item-right">
-              <el-form-item label="申请人:"></el-form-item>
+          </el-row>
+          <el-row>
+            <el-col :span="8" class="tcenterb"><span>其中含运费</span></el-col>
+            <el-col :span="3" class="tleftb"><span>一次运费</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.onceFreight }}</el-form-item>
             </el-col>
+            <el-col :span="3" class="tleftb"><span>二次运费</span></el-col>
             <el-col :span="5">
-              <el-form-item>
-                <el-input v-model="formobj.applicationName" readonly/>
-              </el-form-item>
+              <el-form-item>{{ formobj.secondaryFreight }}</el-form-item>
             </el-col>
           </el-row>
-          <el-row class="linetwo">
-            <el-col :span="3" class="el-form-item-right">
-              <el-form-item label="车型:"></el-form-item>
+          <div class="title">
+            <div>政策详情(含签单折让、开票下浮等)</div>
+            <el-checkbox disabled v-model="freightChecked"><span style="color: #FFFFFF">扣减运费</span></el-checkbox>
+          </div>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>政策1</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.policyOne }}</el-form-item>
             </el-col>
-            <el-col :span="21">
-              <el-form-item>
-                <el-input v-model="formobj.modelName" readonly/>
-              </el-form-item>
+            <el-col :span="3" class="tleftb"><span>可享受金额</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.eligibleAmountOne }}</el-form-item>
+            </el-col>
+            <el-col :span="8" class="tcenterb"><span>计算政策2时:<el-checkbox disabled style="padding-left: 5px" v-model="policyOneChecked">扣减政策1</el-checkbox></span><span style="padding-left: 15px">计算政策3时:<el-checkbox disabled style="padding-left: 5px" v-model="policyTwoChecked">扣减政策1</el-checkbox><el-checkbox disabled v-model="policyThreeChecked">扣减政策2</el-checkbox></span></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>政策2</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.policyTwo }}</el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb"><span>可享受比例（%）</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.eligibleProportionTwo }}</el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb"><span>对应金额</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.corrMoneyTwo }}</el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>政策3</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.policyThree }}</el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb"><span>可享受比例（%）</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.eligibleProportionThree }}</el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb"><span>对应金额</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.corrMoneyThree }}</el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>金额合计</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.moneyCount }}</el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb"><span>政策备注</span></el-col>
+            <el-col :span="13">
+              <el-form-item>{{ formobj.policyRemarks }}</el-form-item>
             </el-col>
           </el-row>
-          <el-row class="linetwo">
-            <el-col :span="3" class="el-form-item-right">
-              <el-form-item label="常用配置:"></el-form-item>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>厂家政策截图</span></el-col>
+            <el-col :span="21">
+              <div v-for="item in formobj.scmFiles" style="float: left">
+                <div style="display: flex;flex-direction: column;justify-content: center;align-items: center;" >
+                  <el-image style="cursor:pointer;width: 150px;height: 150px;margin-top: 5px" :src="item.filePath" @click="magnify(item.filePath)">
+                  </el-image>
+                </div>
+              </div>
             </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>厂家结算价</span></el-col>
             <el-col :span="21">
-              <el-form-item>
-                <el-input v-model="formobj.configName" readonly/>
-              </el-form-item>
+              <el-form-item>{{ formobj.costPrice }}</el-form-item>
             </el-col>
           </el-row>
-          <div class="tableStyle">
-            <div style="margin-left: 5px;font-weight: bold">车辆列表</div>
+          <div class="title">
+            <div>车辆列表</div>
           </div>
           <el-table :key="tableKey" :data="formobj.vehicleList" :index="index" border style="width: 100%">
-            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column fixed width="60px" label="序号" type="index" :index="index + 1" align="center" />
             <el-table-column label="车架号" align="left" header-align="center">
               <template slot-scope="scope" prop="vehicleName">
-                <el-input v-model="scope.row.vinNo" placeholder="" class="addinputw" clearable readonly/>
+                {{ scope.row.vinNo }}
               </template>
             </el-table-column>
             <el-table-column label="备注" header-align="center">
               <template slot-scope="scope" prop="remarks">
-                <el-input v-model="scope.row.remarks" placeholder="" class="addinputw" clearable readonly/>
+                {{ scope.row.remarks }}
               </template>
             </el-table-column>
           </el-table>
-          <el-row class="linetwo" style="margin-top: 10px">
-            <el-col>
-              <el-col :span="3" class="el-form-item-right">
-                <el-form-item label="厂家发车日期:"></el-form-item>
-              </el-col>
-              <el-col :span="21">
-                <el-form-item>
-                  <el-input v-model="formobj.departureDate" placeholder="" class="addinputw" clearable readonly/>
-                </el-form-item>
-              </el-col>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>厂家入库日期</span></el-col>
+            <el-col :span="9">
+              <el-form-item>{{ formobj.priceDate }}</el-form-item>
             </el-col>
-          </el-row>
-          <el-row class="linetwo">
-            <el-col :span="3" class="el-form-item-right">
-              <el-form-item label="备注:"></el-form-item>
+            <el-col :span="3" class="tleftb"><span>厂家发车日期</span></el-col>
+            <el-col :span="9">
+              <el-form-item>{{ formobj.departureDate }}</el-form-item>
             </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>备注</span></el-col>
             <el-col :span="21">
-              <el-form-item>
-                <el-input v-model="formobj.remarks" clearable readonly/>
-              </el-form-item>
+              <el-form-item>{{ formobj.remarks }}</el-form-item>
             </el-col>
           </el-row>
         </el-form>
       </div>
     </div>
-    <!--End 添加修改部分-->
+    <el-dialog :visible.sync="dialogVisible">
+      <img width="100%" :src="dialogUrl" alt="">
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import req from '@/api/ruzhang/scmapplyinbound'
+
 export default {
-  name: 'ruzhangInfo',
+  name: 'RuzhangAdd',
   data() {
     return {
       viewTitle: '',
       index: 0,
       tableKey: 0,
+      dialogVisible: false,
+      dialogUrl: '',
+      freightChecked: false, // 扣减运费
+      policyOneChecked: false, // 计算政策2： 扣减政策1
+      policyTwoChecked: false, // 计算政策3： 扣减政策1
+      policyThreeChecked: false, // 计算政策3： 扣减政策2
       // 表单数据
       formobj: {
-        sid: '', // 一条数据的sid
-        applicationSid: window.sessionStorage.getItem('userSid'), // 用户人sid
-        applicationName: window.sessionStorage.getItem('name'), // 申请人
-        applicationCode: '', // 申请编号
+        amongSzPrice: '',
+        applicationCode: '',
+        applicationDate: '',
+        applicationName: '',
+        applicationSid: '',
         configName: '',
+        configSid: '',
+        contractPrice: '',
+        corrMoneyThree: '',
+        corrMoneyTwo: '',
+        costPrice: '',
         departureDate: '',
+        eligibleAmountOne: '',
+        eligibleProportionThree: '',
+        eligibleProportionTwo: '',
+        insideCode: '',
         modelName: '',
         modelSid: '',
+        moneyCount: '',
+        nodeState: '',
+        num: '',
+        onceFreight: '',
+        policyOne: '',
+        policyRemarks: '',
+        policyThree: '',
+        policyTwo: '',
+        priceDate: '',
         purchaseOrderNo: '',
-        remarks: '', // 备注
-        vehicleOrderSid: '',
-        vehicleList: []
+        remarks: '',
+        secondaryFreight: '',
+        userSid: '',
+        useOrgName: '',
+        useOrgSid: '',
+        deductionFreight: '',
+        deductionPolicyThreeOne: '',
+        deductionPolicyThreeTwo: '',
+        deductionPolicyTwoOne: '',
+        scmFiles: [],
+        vehicleList: [],
+        vehicleOrderSid: ''
       },
       rules: {},
       submitdisabled: false
@@ -139,81 +252,70 @@ export default {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
-      this.viewTitle = '入账单详情'
+      this.viewTitle = '入账单'
       console.log('编辑回显', sid, row)
-      req.fetchBySid(sid).then((resp) => {
+      req.fetchBySid(sid).then(resp => {
         const data = resp.data
-        this.formobj.applicationCode = data.applicationCode
-        this.formobj.remarks = data.remarks
-        this.formobj.sid = sid
-        this.formobj.configName = data.configName
-        this.formobj.departureDate = data.departureDate
-        this.formobj.modelName = data.modelName
-        this.formobj.modelSid = data.modelSid
-        this.formobj.purchaseOrderNo = data.purchaseOrderNo
-        this.formobj.vehicleOrderSid = data.vehicleOrderSid
-        if (data.inboundVehicleList.length > 0) {
-          data.inboundVehicleList.forEach((e) => {
-            this.formobj.vehicleList.push({
-              applySid: e.applySid,
-              remarks: e.remarks,
-              modelSid: e.modelSid,
-              sid: e.sid,
-              vinNo: e.vinNo
-            })
-          })
+        this.formobj = data
+        if (this.formobj.deductionFreight === '0') {
+          this.freightChecked = true
+        } else {
+          this.freightChecked = false
+        }
+        if (this.formobj.deductionPolicyTwoOne === '0') {
+          this.policyOneChecked = true
+        } else {
+          this.policyOneChecked = false
         }
-      }).catch((e) => {
+        if (this.formobj.deductionPolicyTwoOne === '0') {
+          this.policyTwoChecked = true
+        } else {
+          this.policyTwoChecked = false
+        }
+        if (this.formobj.deductionPolicyThreeTwo === '0') {
+          this.policyThreeChecked = true
+        } else {
+          this.policyThreeChecked = false
+        }
+      }).catch(e => {
         this.formobj = row
       })
     },
+    magnify(val) {
+      this.dialogVisible = true
+      this.dialogUrl = val
+    },
     // 返回（===既判断又赋值）
     handleReturn(isreload) {
       if (isreload === 'true') this.$emit('reloadlist')
-      this.formobj.departureDate = ''
-      this.formobj.remarks = '' // 备注
-      this.formobj.vehicleList = []
       this.$refs['form_obj'].resetFields()
       this.$emit('doback')
-    },
+    }
   }
 }
 </script>
 
 <style scoped>
-.wlInfo {
-  text-align: center;
-  font-size: 28px;
-  line-height: 90px;
-}
-.lineone {
-  border-bottom: 2px solid #e0e3eb;
-}
-.lineone .el-form-item {
-  margin-bottom: -10px;
-}
-.lineone >>> .el-input__inner {
-  border: 0;
-}
-.linetwo {
-  margin-top: 10px;
+.title {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
 }
-.linetwo .el-form-item {
-  margin-bottom: 0px !important;
+.tcenterb {
+  text-align: center;
+  font-size: 14px;
+  color: #606266;
+  line-height: 40px !important;
+  font-weight: 600;
 }
-.linetwo >>> .el-input__inner {
-  border: 0;
+.rowStyle {
+  border-left: 0px;
 }
-.tableStyle {
-  background-color: #FFFFFF;
-  display: flex;
-  justify-content: flex-start;
-  align-items: center;
-  border: 1px solid #dfe4ed;
-  height: 40px;
+.colOneStyle {
+  border-right: 0px !important;
+  border-bottom: 0px !important;
 }
-.el-form-item-right {
-  text-align: right;
+.freight {
+  color: #FFFFFF;
 }
 </style>
-
diff --git a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue
index 8baea6c0e4..362f048a56 100644
--- a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue
@@ -1,80 +1,66 @@
 <template>
   <div class="app-container">
-    <div v-show="viewState == 1">
-      <div class="tab-header webtop">
-        <div>入账申请单管理</div>
-        <div>
-          <el-button type="info" size="small">关闭</el-button>
-        </div>
-      </div>
-      <div  class="main-content">
-      <div class="searchcon">
-        <el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">{{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}
-        </el-button>
-        <div v-show="isSearchShow" class="search">
-          <el-form :inline="true" class="tab-header">
-            <el-form-item label="采购订单编号:">
-              <el-input v-model="queryParams.params.purchaseOrderNo" placeholder="" clearable/>
-            </el-form-item>
-            <el-form-item label="车型:">
-              <el-input v-model="queryParams.params.modelName" placeholder="" clearable/>
-            </el-form-item>
-            <el-form-item class="formItem" label="申请日期:">
-              <el-date-picker value-format="yyyy-MM-dd" v-model="queryParams.params.applicationDateStart" clearable style="width: 160px;" type="date" placeholder="开始日期"/>
-              <div class="line">至</div>
-              <el-date-picker value-format="yyyy-MM-dd" v-model="queryParams.params.applicationDateEnd" clearable style="width: 160px;" type="date" placeholder="结束日期"/>
-            </el-form-item>
-            <el-form-item label="状态:">
-              <el-input v-model="queryParams.params.nodeState" placeholder="" clearable/>
-            </el-form-item>
-            <el-divider/>
+    <div v-show="viewState ==1">
+      <button-bar ref="btnbar" view-title="入账申请管理" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">
+            {{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}
+          </el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form :inline="true" class="tab-header" label-width="120px">
+              <el-form-item label="采购订单编号:">
+                <el-input v-model="queryParams.params.purchaseOrderNo" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="车型:">
+                <el-input v-model="queryParams.params.modelName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item class="formItem" label="申请日期:">
+                <el-date-picker value-format="yyyy-MM-dd" v-model="queryParams.params.applicationDateStart" clearable style="width: 160px;" type="date" placeholder="开始日期"/>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker value-format="yyyy-MM-dd" v-model="queryParams.params.applicationDateEnd" clearable style="width: 160px;" type="date" placeholder="结束日期"/>
+              </el-form-item>
+              <el-form-item label="状态:">
+                <el-input v-model="queryParams.params.nodeState" placeholder="" clearable/>
+              </el-form-item>
+            </el-form>
             <div class="btn" style="text-align: center;">
-              <el-button type="primary" @click="dosearch" icon="el-icon-search">查询</el-button>
-              <el-button type="primary" @click="resetQuery">重置</el-button>
+              <el-button type="primary" size="small" @click="dosearch" icon="el-icon-search">查询</el-button>
+              <el-button type="primary" size="small" @click="resetQuery" icon="el-icon-refresh">重置</el-button>
             </div>
-          </el-form>
+          </div>
         </div>
-      </div>
-      <!--Start 项目列表头部-->
-      <div class="listtop">
-        <div class="tit">入账申请列表</div>
-        <pageye v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
-      </div>
-      <!--End 项目列表头部-->
-
-      <!--Start 项目列表-->
-      <div class="listcon">
-        <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="handleSelectionChange">
-          <el-table-column width="50" label="序号" type="index" :index="indexMethod" align="center"/>
-          <el-table-column width="150" 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>
-              <el-button v-else type="info" size="mini">办理</el-button>
-              <el-button type="primary" size="small" @click="toInfo(scope.row)">查看</el-button>
-            </template>
-          </el-table-column>
-          <el-table-column width="130" prop="nodeState" label="状态" align="center"/>
-         <!-- <el-table-column width="200" prop="applicationCode" label="申请编号" align="center"/>-->
-          <el-table-column width="100" prop="applicationDate" label="申请日期" align="center"/>
-          <el-table-column width="180" prop="purchaseOrderNo" label="采购订单编号" align="center"/>
-          <el-table-column prop="modelName" label="车型" align="center"/>
-          <el-table-column width="80" prop="vehicleNum" fit label="台数" align="center"/>
-          <el-table-column width="100" prop="contractPrice" fit label="厂家合同价" align="center"/>
-          <el-table-column width="100" prop="moneyCount" fit label="政策金额合计" align="center"/>
-          <el-table-column width="100" prop="costPrice" fit label="厂家结算价" align="center"/>
-          <el-table-column width="100" prop="departureDate" fit label="发车日期" align="center"/>
-        </el-table>
-      </div>
-      <!--End 项目列表-->
-      <div class="pages">
-        <!-- 翻页 -->
-        <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
-      </div>
+        <div class="listtop">
+          <div class="tit">入账申请列表</div>
+          <pageye v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
+        </div>
+        <div class="">
+          <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="handleSelectionChange">
+            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column fixed width="150" label="操作" align="center">
+              <template slot-scope="scope">
+                <el-button v-if="scope.row.nodeState=='待提交'||(scope.row.nodeState!='待提交'&&scope.row.nodeState=='入账申请')" type="primary" size="small" @click="toEdit(scope.row)">办理
+                </el-button>
+                <el-button v-else type="info" size="small">办理</el-button>
+                <el-button type="primary" size="small" @click="toInfo(scope.row)">查看</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column prop="nodeState" label="状态" header-align="center" align="left"/>
+            <el-table-column prop="applicationDate" label="申请日期" align="center" width="100"/>
+            <el-table-column prop="purchaseOrderNo" label="采购订单编号" align="center" width="200"/>
+            <el-table-column prop="modelName" label="车型" align="center"/>
+            <el-table-column prop="vehicleNum" fit label="台数" align="center" width="60"/>
+            <el-table-column prop="contractPrice" fit label="厂家合同价" align="center" width="130"/>
+            <el-table-column prop="moneyCount" fit label="政策金额合计" align="center" width="130"/>
+            <el-table-column prop="costPrice" fit label="厂家结算价" align="center" width="130"/>
+            <el-table-column prop="departureDate" fit label="发车日期" align="center" width="100"/>
+          </el-table>
         </div>
+        <div class="pages">
+          <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
+        </div>
+      </div>
     </div>
-    <!--End 查询和其列表部分-->
-
     <!--新增修改部分组件-->
     <div-add v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList"/>
     <!--详情部分组件-->
@@ -107,7 +93,16 @@ export default {
       tableLoading: false,
       // 列表数据
       dataList: [],
-      multipleSelection :[],
+      btnList: [
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
+      multipleSelection: [],
       // sid数组
       sids: [], // 用于导出的时候保存已选择SID
       sides: '', // 一条数据的sid
@@ -129,7 +124,19 @@ export default {
   created() {
     this.loadList()
   },
+  mounted() {
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
   methods: {
+    btnHandle(btnKey) {
+      switch (btnKey) {
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
     // 获取数据sid
     handleSelectionChange(row) {
       this.multipleSelection = row
@@ -170,14 +177,14 @@ export default {
     resetQuery() {
       this.queryParams = {
         current: 1,
-          size: 10,
-          total: 0,
-          params: {
+        size: 10,
+        total: 0,
+        params: {
           applicationDateStart: '',
-            applicationDateEnd: '',
-            nodeState: '',
-            purchaseOrderNo: '',
-            modelName: ''
+          applicationDateEnd: '',
+          nodeState: '',
+          purchaseOrderNo: '',
+          modelName: ''
         }
       }
       this.dosearch()
@@ -205,16 +212,16 @@ export default {
     // 删除
     doDel(row) {
       if (this.sids.length === 0) {
-        this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
+        this.$message({showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作'})
         return
       }
-      var b=false;
+      var b = false;
       this.multipleSelection.forEach(row => {
-        if(!(row.nodeState === '待提交')){
-          b=true
+        if (!(row.nodeState === '待提交')) {
+          b = true
         }
       })
-      if(b){
+      if (b) {
         this.$message({showClose: true, type: 'error', message: '提交流程审批的记录不能进行删除!'})
         return
       }
@@ -233,42 +240,25 @@ export default {
         const _this = this
         req.delBySids(this.sids).then(resp => {
           loading.close()
-          _this.$message({ type: 'success', message: resp.msg, showClose: true })
+          _this.$message({type: 'success', message: resp.msg, showClose: true})
           _this.loadList()
         }).catch(e => {
           loading.close()
         })
-      }).catch(() => {})
+      }).catch(() => {
+      })
     },
     // 子组件关闭（返回）
     resetState() {
       this.viewState = 1
-      this.loadList()
+    },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route)
+      this.$router.go(-1)
     }
   }
 }
 </script>
 
 <style scoped>
-.line {
-  display: inline-block;
-  margin: 0px 15px;
-}
-.listtop {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  border: 1px solid #dfe4ed;
-  height: 40px;
-}
-.tit {
-  margin-bottom: -10px;
-}
-
-.pagination {
-  margin-bottom: -10px;
-}
-.formItem {
-  margin-right: 28px;
-}
 </style>
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByBusinessDivisionInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByBusinessDivisionInfo.vue
new file mode 100644
index 0000000000..aa9f22f79b
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByBusinessDivisionInfo.vue
@@ -0,0 +1,331 @@
+<template>
+  <div class="app-container">
+    <div>
+      <!--标题按钮部分开始-->
+      <div class="tab-header webtop">
+        <!--标题-->
+        <div>分公司间调车申请详情</div>
+        <!--start 添加修改按钮-->
+        <div>
+          <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="titwu"><span>分公司间调车申请详情</span></div>
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #E0E3EB">
+            <el-col :span="8">
+              <div class="span-sty spanOneWidth"><span>调车类型</span></div>
+              <el-form-item>
+                <span class="addinputInfo addinputwOne">{{ formobj.shuntingTypeValue }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty spanOneWidth"><span>调出分公司</span></div>
+              <el-form-item>
+                <span class="addinputInfo addinputwOne">{{ formobj.sellerOrgName }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty spanOneWidth"><span>调入分公司</span></div>
+              <el-form-item>
+                <span class="addinputInfo addinputwOne">{{ formobj.buyerOrgName }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">
+            <div>申请车辆列表</div>
+          </div>
+          <el-table :key="tableKey" :data="formobj.baseInternalPurchaseVehicles" :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="200">
+              <template slot-scope="scope" prop="vehicleName">
+                <span>{{ scope.row.vehicleAlias }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="常用配置" align="left" header-align="center" width="400">
+              <template slot-scope="scope">
+                <span>{{ scope.row.configName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="车架号" align="center" width="200">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vinNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="库存地点" align="center" width="150">
+              <template slot-scope="scope">
+                <span>{{ scope.row.inventoryLocationName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="内销价格" align="center" width="150">
+              <template slot-scope="scope">
+                <span>{{ scope.row.witPinMoney }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="发票类型" align="center" width="150">
+              <template slot-scope="scope">
+                <span>{{ scope.row.invoiceTypeValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="运费" align="center" width="150">
+              <template slot-scope="scope">
+                <span>{{ scope.row.freight }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="运费承担方" align="center" width="150">
+              <template slot-scope="scope">
+                <span>{{ scope.row.freightUndertakerType }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" align="center" width="200">
+              <template slot-scope="scope">
+                <span>{{ scope.row.remarks }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form>
+      </div>
+    </div>
+    <!-- 选择待办人 的弹出框-->
+    <el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
+      <el-form label-position="right" class="formadd" >
+        <el-row v-show="currentLink" 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>{{ 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>
+        </el-row>
+        <div style="text-align:center;margin-top: 20px;">
+          <el-button type="primary" size="mini" @click="reject">确 定</el-button>
+          <el-button type="info " size="mini" @click="nodeDialogVisible = false">取 消</el-button>
+        </div>
+      </el-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import req from '@/api/supplychain/cheliangneigou'
+
+export default {
+  name: 'neigouDaiBanByBusinessDivisionInfo',
+  data() {
+    return {
+      index: 0,
+      tableKey: 0,
+      // 表单数据
+      formobj: {},
+      operation: '', // 点击操作按钮
+      dialogList: {
+        comment: ''
+      },
+      startTask: true,
+      current: {
+        taskDefKey: '',
+        taskName: '' // 当前环节名称
+      },
+      nextNode: {}, // 下一环节
+      nodeDialogVisible: false,
+      currentLink: true,
+      // 环节所需参数
+      linkByParameter: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        orgSidPath: '',
+        taskDefKey: '',
+        userSid: ''
+      },
+      rules: {}
+    }
+  },
+  created() {
+    console.log('url:' + window.location.href)
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    console.log('obj:', obj)
+    // 点击（同意、终止、驳回、驳回）操作时所需的参数
+    this.linkByParameter.businessSid = obj.businessSid
+    this.linkByParameter.instanceId = obj.instanceId
+    this.linkByParameter.taskId = obj.taskId
+    this.linkByParameter.taskDefKey = obj.taskDefKey
+    this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
+    this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
+    this.current.taskDefKey = obj.taskDefKey
+    this.current.taskName = obj.taskName
+    // 加载表单数据
+    this.showInfo(obj.businessSid)
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: 400 + 'px'
+      }
+    }, '*')
+  },
+  methods: {
+    showInfo(sid) {
+      req.fetchBySid(sid).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+        }
+      })
+    },
+    // 同意
+    openAgree(val) {
+      this.operation = val
+      this.currentLink = true
+      this.dialogList.comment = '同意'
+      req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey }).then((resp) => {
+        if (resp.success) {
+          var arr = resp.data
+          this.nextNode = arr[0]
+          this.nodeDialogVisible = true
+        }
+        this.submitdisabled = false
+      })
+    },
+    // 驳回
+    openReject(val) {
+      this.operation = val
+      this.currentLink = true
+      this.dialogList.comment = ''
+      req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey }).then((resp) => {
+        if (resp.success) {
+          var arr = resp.data
+          this.nextNode = arr[0]
+          this.nodeDialogVisible = true
+        }
+        this.submitdisabled = false
+      })
+    },
+    // 终止
+    openStop(val) {
+      this.operation = val
+      this.currentLink = false
+      this.dialogList.comment = ''
+      this.nodeDialogVisible = true
+    },
+    reject() {
+      if (this.operation === '同意') {
+        this.handleAgree()
+      } else if (this.operation === '驳回') {
+        if (this.dialogList.comment === '') {
+          this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
+        } else {
+          this.handleReject()
+        }
+      } else if (this.operation === '终止') {
+        if (this.dialogList.comment === '') {
+          this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
+        } else {
+          this.handleStop()
+        }
+      }
+    },
+    /** 同意任务 */
+    handleAgree() {
+      this.linkByParameter.comment = this.dialogList.comment
+      req.companyToDivisionOperate(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值(关闭弹框)
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    /** 驳回任务 */
+    handleReject() {
+      this.linkByParameter.comment = this.dialogList.comment
+      req.reject(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    /** 终止任务 */
+    handleStop() {
+      this.linkByParameter.comment = this.dialogList.comment
+      req.breakProcess(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.listconadd {
+  height: calc(100vh - 0px) !important;
+}
+.title {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
+.spanOneWidth {
+  width: 100px !important;
+}
+.addinputwOne {
+  margin-left: 110px !important;
+}
+</style>
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue
new file mode 100644
index 0000000000..e0b381fc7c
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue
@@ -0,0 +1,512 @@
+<template>
+  <div class="app-container">
+    <div>
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <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>
+      <div class="listconadd">
+        <div class="titwu"><span>车辆入账申请单</span></div>
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
+          <el-row class="rowStyle">
+            <el-col :span="20" class="colOneStyle"></el-col>
+            <el-col :span="4" class="tleftb colOneStyle">
+              <span style="font-size: 16px">金额单位：元</span>
+            </el-col>
+          </el-row>
+          <el-row style="border-top: 1px solid #E0E3EB">
+            <el-col :span="3" class="tleftb"><span>分公司</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.useOrgName }}</el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb"><span>申请日期</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.applicationDate }}</el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb"><span>申请人</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.applicationName }}</el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>采购订单编号</span></el-col>
+            <el-col :span="21">
+              <el-form-item>{{ formobj.purchaseOrderNo }}</el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>车型</span></el-col>
+            <el-col :span="21">
+              <el-form-item>{{ formobj.modelName }}</el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>常用配置</span></el-col>
+            <el-col :span="21">
+              <el-form-item>{{ formobj.configName }}</el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>厂家合同价</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.contractPrice }}</el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb"><span>其中上装价格</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.amongSzPrice }}</el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb"><span>上装价格计算依据</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.szPriceCalBasis }}</el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8" class="tcenterb"><span>其中含运费</span></el-col>
+            <el-col :span="3" class="tleftb"><span>一次运费</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.onceFreight }}</el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb"><span>二次运费</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.secondaryFreight }}</el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">
+            <div>政策详情(含签单折让、开票下浮等)</div>
+            <el-checkbox disabled v-model="freightChecked"><span style="color: #FFFFFF">扣减运费</span></el-checkbox>
+          </div>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>政策1</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.policyOne }}</el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb"><span>可享受金额</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.eligibleAmountOne }}</el-form-item>
+            </el-col>
+            <el-col :span="8" class="tcenterb"><span>计算政策2时:<el-checkbox disabled style="padding-left: 5px" v-model="policyOneChecked">扣减政策1</el-checkbox></span><span style="padding-left: 15px">计算政策3时:<el-checkbox disabled style="padding-left: 5px" v-model="policyTwoChecked">扣减政策1</el-checkbox><el-checkbox disabled v-model="policyThreeChecked">扣减政策2</el-checkbox></span></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>政策2</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.policyTwo }}</el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb"><span>可享受比例（%）</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.eligibleProportionTwo }}</el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb"><span>对应金额</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.corrMoneyTwo }}</el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>政策3</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.policyThree }}</el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb"><span>可享受比例（%）</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.eligibleProportionThree }}</el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb"><span>对应金额</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.corrMoneyThree }}</el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>金额合计</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.moneyCount }}</el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb"><span>政策备注</span></el-col>
+            <el-col :span="13">
+              <el-form-item>{{ formobj.policyRemarks }}</el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>厂家政策截图</span></el-col>
+            <el-col :span="21">
+              <div v-for="item in formobj.scmFiles" style="float: left">
+                <div style="display: flex;flex-direction: column;justify-content: center;align-items: center;" >
+                  <el-image style="cursor:pointer;width: 150px;height: 150px;margin-top: 5px" :src="item.filePath" @click="magnify(item.filePath)">
+                  </el-image>
+                </div>
+              </div>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>厂家结算价</span></el-col>
+            <el-col :span="21">
+              <el-form-item>{{ formobj.costPrice }}</el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">
+            <div>车辆列表</div>
+          </div>
+          <el-table :key="tableKey" :data="formobj.vehicleList" :index="index" border style="width: 100%">
+            <el-table-column fixed width="60px" label="序号" type="index" :index="index + 1" align="center" />
+            <el-table-column label="车架号" align="left" header-align="center">
+              <template slot-scope="scope" prop="vehicleName">
+                {{ scope.row.vinNo }}
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" header-align="center">
+              <template slot-scope="scope" prop="remarks">
+                {{ scope.row.remarks }}
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>厂家入库日期</span></el-col>
+            <el-col :span="9">
+              <el-form-item>{{ formobj.priceDate }}</el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb"><span>厂家发车日期</span></el-col>
+            <el-col :span="9">
+              <el-form-item>{{ formobj.departureDate }}</el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>备注</span></el-col>
+            <el-col :span="21">
+              <el-form-item>{{ formobj.remarks }}</el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <el-dialog :visible.sync="dialogVisible">
+      <img width="100%" :src="dialogUrl" alt="">
+    </el-dialog>
+    <!-- 选择待办人 的弹出框-->
+    <el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
+      <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 addinputOne">{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <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 addinputOne" clearable ></el-input></el-form-item>
+          </el-col>
+        </el-row>
+        <div style="text-align:center;margin-top: 20px;">
+          <el-button type="primary" size="mini" @click="reject">确 定</el-button>
+          <el-button type="info " size="mini" @click="nodeDialogVisible = false">取 消</el-button>
+        </div>
+      </el-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import req from '@/api/ruzhang/scmapplyinbound'
+
+export default {
+  name: 'ruzhangDaiBanInfo',
+  data() {
+    return {
+      viewTitle: '',
+      index: 0,
+      tableKey: 0,
+      dialogVisible: false,
+      dialogUrl: '',
+      freightChecked: false, // 扣减运费
+      policyOneChecked: false, // 计算政策2： 扣减政策1
+      policyTwoChecked: false, // 计算政策3： 扣减政策1
+      policyThreeChecked: false, // 计算政策3： 扣减政策2
+      operation: '', // 点击操作按钮
+      dialogList: {
+        comment: ''
+      },
+      startTask: true,
+      current: {
+        taskDefKey: '',
+        taskName: '' // 当前环节名称
+      },
+      nextNode: {}, // 下一环节
+      nodeDialogVisible: false,
+      currentLink: true,
+      // 表单数据
+      formobj: {
+        amongSzPrice: '',
+        applicationCode: '',
+        applicationDate: '',
+        applicationName: '',
+        applicationSid: '',
+        configName: '',
+        configSid: '',
+        contractPrice: '',
+        corrMoneyThree: '',
+        corrMoneyTwo: '',
+        costPrice: '',
+        departureDate: '',
+        eligibleAmountOne: '',
+        eligibleProportionThree: '',
+        eligibleProportionTwo: '',
+        insideCode: '',
+        modelName: '',
+        modelSid: '',
+        moneyCount: '',
+        nodeState: '',
+        num: '',
+        onceFreight: '',
+        policyOne: '',
+        policyRemarks: '',
+        policyThree: '',
+        policyTwo: '',
+        priceDate: '',
+        purchaseOrderNo: '',
+        remarks: '',
+        secondaryFreight: '',
+        userSid: '',
+        useOrgName: '',
+        useOrgSid: '',
+        deductionFreight: '',
+        deductionPolicyThreeOne: '',
+        deductionPolicyThreeTwo: '',
+        deductionPolicyTwoOne: '',
+        scmFiles: [],
+        vehicleList: [],
+        vehicleOrderSid: ''
+      },
+      // 环节所需参数
+      linkByParameter: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        orgSidPath: '',
+        taskDefKey: '',
+        userSid: ''
+      },
+      rules: {},
+      submitdisabled: false
+    }
+  },
+  created() {
+    console.log('url:' + window.location.href)
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    console.log('iframe页面获取的obj:', obj)
+    // 点击（同意、终止、驳回、驳回）操作时所需的参数
+    this.linkByParameter.businessSid = obj.businessSid
+    this.linkByParameter.instanceId = obj.instanceId
+    this.linkByParameter.taskId = obj.taskId
+    this.linkByParameter.taskDefKey = obj.taskDefKey
+    this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
+    this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
+    this.current.taskDefKey = obj.taskDefKey
+    this.current.taskName = obj.taskName
+    // 加载表单数据
+    this.showInfo(obj.businessSid)
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: 600 + 'px'
+      }
+    }, '*')
+  },
+  methods: {
+    showInfo(sid, row) {
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      this.viewTitle = '入账单'
+      console.log('编辑回显', sid, row)
+      req.fetchBySid(sid).then(resp => {
+        const data = resp.data
+        this.formobj = data
+        if (this.formobj.deductionFreight === '0') {
+          this.freightChecked = true
+        } else {
+          this.freightChecked = false
+        }
+        if (this.formobj.deductionPolicyTwoOne === '0') {
+          this.policyOneChecked = true
+        } else {
+          this.policyOneChecked = false
+        }
+        if (this.formobj.deductionPolicyTwoOne === '0') {
+          this.policyTwoChecked = true
+        } else {
+          this.policyTwoChecked = false
+        }
+        if (this.formobj.deductionPolicyThreeTwo === '0') {
+          this.policyThreeChecked = true
+        } else {
+          this.policyThreeChecked = false
+        }
+      }).catch(e => {
+        this.formobj = row
+      })
+    },
+    magnify(val) {
+      this.dialogVisible = true
+      this.dialogUrl = val
+    },
+    // 同意
+    openAgree(val) {
+      this.operation = val
+      this.currentLink = true
+      this.dialogList.comment = '同意'
+      req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey }).then((resp) => {
+        if (resp.success) {
+          var arr = resp.data
+          this.nextNode = arr[0]
+          this.nodeDialogVisible = true
+        }
+        this.submitdisabled = false
+      })
+    },
+    // 驳回
+    openReject(val) {
+      this.operation = val
+      this.currentLink = true
+      this.dialogList.comment = ''
+      req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey }).then((resp) => {
+        if (resp.success) {
+          var arr = resp.data
+          this.nextNode = arr[0]
+          this.nodeDialogVisible = true
+        }
+        this.submitdisabled = false
+      })
+    },
+    // 终止
+    openStop(val) {
+      this.operation = val
+      this.currentLink = false
+      this.dialogList.comment = ''
+      this.nodeDialogVisible = true
+    },
+    reject() {
+      if (this.operation === '同意') {
+        this.handleAgree()
+      } else if (this.operation === '驳回') {
+        if (this.dialogList.comment === '') {
+          this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
+        } else {
+          this.handleReject()
+        }
+      } else if (this.operation === '终止') {
+        if (this.dialogList.comment === '') {
+          this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
+        } else {
+          this.handleStop()
+        }
+      }
+    },
+    /** 同意任务 */
+    handleAgree() {
+      this.linkByParameter.comment = this.dialogList.comment
+      req.complete(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    /** 驳回任务 */
+    handleReject() {
+      this.linkByParameter.comment = this.dialogList.comment
+      req.reject(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    /** 终止任务 */
+    handleStop() {
+      this.linkByParameter.comment = this.dialogList.comment
+      req.breakProcess(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.listconadd {
+  height: calc(100vh - 0px) !important;
+}
+.title {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.tcenterb {
+  text-align: center;
+  font-size: 14px;
+  color: #606266;
+  line-height: 40px !important;
+  font-weight: 600;
+}
+.rowStyle {
+  border-left: 0px;
+}
+.colOneStyle {
+  border-right: 0px !important;
+  border-bottom: 0px !important;
+}
+.freight {
+  color: #FFFFFF;
+}
+</style>
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangInfo.vue
deleted file mode 100644
index acc17ebcf5..0000000000
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangInfo.vue
+++ /dev/null
@@ -1,497 +0,0 @@
-<template>
-  <div>
-    <!--标题按钮部分开始-->
-    <div class="tab-header webtop">
-      <!--标题-->
-      <div>{{ viewTitle }}</div>
-      <!--start 添加修改按钮-->
-      <div>
-        <el-button v-show="transactState == '00'" type="primary" @click="openAgree">同 意</el-button>
-        <el-button v-show="transactState == '00'" type="danger" @click="openReject">驳 回</el-button>
-        <el-button v-show="transactState == '00'" type="danger" @click="openStop">终 止</el-button>
-        <el-button v-show="transactState == '01'" type="danger" @click="openRevoke">撤 回</el-button>
-      </div>
-    </div>
-    <!--标题按钮部分结束-->
-    <!--Start 新增修改部分-->
-    <div>
-      <div class="wlInfo"><span>车辆入账单</span></div>
-      <el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top">
-        <el-row class="linetwo">
-          <el-col :span="3" class="el-form-item-right"><el-form-item label="申请编号:" /></el-col>
-          <el-col :span="5">
-            <el-form-item><el-input v-model="formobj.applicationCode" readonly /></el-form-item>
-          </el-col>
-          <el-col :span="3" class="el-form-item-right"><el-form-item label="采购订单编号:" /></el-col>
-          <el-col :span="5">
-            <el-form-item><el-input v-model="formobj.purchaseOrderNo" readonly /></el-form-item>
-          </el-col>
-          <el-col :span="3" class="el-form-item-right"><el-form-item label="申请人:" /></el-col>
-          <el-col :span="5">
-            <el-form-item><el-input v-model="formobj.applicationName" readonly /></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row class="linetwo">
-          <el-col :span="3" class="el-form-item-right"><el-form-item label="车型:" /></el-col>
-          <el-col :span="21">
-            <el-form-item><el-input v-model="formobj.modelName" readonly /></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row class="linetwo">
-          <el-col :span="3" class="el-form-item-right"><el-form-item label="常用配置:" /></el-col>
-          <el-col :span="21">
-            <el-form-item><el-input v-model="formobj.configName" readonly /></el-form-item>
-          </el-col>
-        </el-row>
-        <div class="tableStyle"><div style="margin-left: 5px;font-weight: bold">车辆列表</div></div>
-        <el-table :key="tableKey" :data="formobj.vehicleList" :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="left" header-align="center">
-            <template slot-scope="scope" prop="vehicleName">
-              <el-input v-model="scope.row.vinNo" placeholder="" class="addinputw" clearable readonly />
-            </template>
-          </el-table-column>
-          <el-table-column label="备注" header-align="center">
-            <template slot-scope="scope" prop="remarks">
-              <el-input v-model="scope.row.remarks" placeholder="" class="addinputw" clearable readonly />
-            </template>
-          </el-table-column>
-        </el-table>
-        <el-row class="linetwo" style="margin-top: 10px">
-          <el-col>
-            <el-col :span="3" class="el-form-item-right"><el-form-item label="厂家发车日期:" /></el-col>
-            <el-col :span="21">
-              <el-form-item><el-input v-model="formobj.departureDate" placeholder="" class="addinputw" clearable readonly /></el-form-item>
-            </el-col>
-          </el-col>
-        </el-row>
-        <el-row class="linetwo">
-          <el-col :span="3" class="el-form-item-right"><el-form-item label="备注:" /></el-col>
-          <el-col :span="21">
-            <el-form-item><el-input v-model="formobj.remarks" clearable readonly /></el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-
-      <!-- 选择待办人 同意 的弹出框-->
-      <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>{{ formobj.nodeState }}->{{ 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 v-model="formobj.comment" size="small" placeholder="审批意见" class="addinputw" clearable /></el-col>
-          </el-row>
-          <div style="text-align:center;margin-top: 20px;">
-            <el-button type="primary" size="mini" @click="handleAgree">确 定</el-button>
-            <el-button type="info " size="mini" @click="closeNodeDialog">取 消</el-button>
-          </div>
-        </el-form>
-      </el-dialog>
-      <!-- 选择待办人 驳回 的弹出框-->
-      <el-dialog title="驳回" :visible.sync="nodeDialogVisibleForReject" 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>{{ formobj.nodeState }}->{{ 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 v-model="formobj.comment" size="small" placeholder="驳回原因" class="addinputw" clearable /></el-col>
-          </el-row>
-          <div style="text-align:center;margin-top: 20px;">
-            <el-button type="primary" size="mini" @click="handleReject">确 定</el-button>
-            <el-button type="info " size="mini" @click="closeNodeDialog">取 消</el-button>
-          </div>
-        </el-form>
-      </el-dialog>
-    </div>
-  </div>
-</template>
-
-<script>
-import req from '@/api/ruzhang/scmapplyinbound'
-export default {
-  name: 'RuzhangInfo',
-  data() {
-    return {
-      // 选择待办人弹框
-      nodeDialogVisible: false,
-      nodeDialogVisibleForReject: false,
-      // 下一环节
-      nextNode: {},
-      viewTitle: '',
-      index: 0,
-      tableKey: 0,
-      // 表单数据
-      formobj: {
-        sid: '', // 一条数据的sid
-        userSid: window.sessionStorage.getItem('userSid'), // 用户人sid
-        orgSidPath: window.sessionStorage.getItem('orgSidPath'),
-        staffSid: window.sessionStorage.getItem('staffSid'),
-        configName: '',
-        configSid: '',
-        departureDate: '',
-        modelName: '',
-        modelSid: '',
-        purchaseOrderNo: '',
-        remarks: '', // 备注
-        vehicleOrderSid: '',
-        vehicleList: [],
-        comment:''
-      },
-      dialogList: {
-        comment: ''
-      },
-      transactState: '', // 办理状态
-      // 同意办理列表
-      agreeList: {
-        businessSid: '',
-        comment: '',
-        instanceId: '',
-        taskId: '',
-        userSid: window.sessionStorage.getItem('userSid')
-      },
-      // 驳回列表
-      regectList: {
-        businessSid: '',
-        comment: '',
-        instanceId: '',
-        taskId: '',
-        userSid: window.sessionStorage.getItem('userSid')
-      },
-      // 终止列表
-      stopList: {
-        businessSid: '',
-        comment: '',
-        instanceId: '',
-        taskId: '',
-        userSid: window.sessionStorage.getItem('userSid')
-      },
-      // 撤回
-      revokeList: {
-        businessSid: '',
-        comment: '',
-        instanceId: '',
-        taskId: '',
-        userSid: window.sessionStorage.getItem('userSid')
-      },
-      rules: {},
-      submitdisabled: false
-    }
-  },
-  created() {
-    // ===获取参数
-    var one = window.location.href.indexOf('&data') + 6
-    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
-    var dd = decodeURIComponent(data)
-    const obj = JSON.parse(dd)
-    var sid = obj.businessSid
-    this.showInfo(sid)
-
-    // 同意列表
-    this.agreeList.businessSid = sid
-    this.agreeList.instanceId = obj.instanceId
-    this.agreeList.taskId = obj.taskId
-    // 驳回列表
-    this.regectList.businessSid = sid
-    this.regectList.instanceId = obj.instanceId
-    this.regectList.taskId = obj.taskId
-    // 终止列表
-    this.stopList.businessSid = sid
-    this.stopList.instanceId = obj.instanceId
-    this.stopList.taskId = obj.taskId
-    // 撤回列表
-    this.revokeList.businessSid = sid
-    this.revokeList.instanceId = obj.instanceId
-    this.revokeList.taskId = obj.taskId
-    // 办理状态
-    this.transactState = obj.transactState
-    window.parent.postMessage(
-      {
-        cmd: 'returnHeight',
-        params: {
-          // 告诉父级页面，子页面的弹框高度。
-          code: 2,
-          data: 600 + 'px'
-        }
-      },
-      '*'
-    )
-  },
-  methods: {
-    // 关闭弹出框 选择待办人弹框
-    closeNodeDialog() {
-      this.nodeDialogVisible = false
-      this.nodeDialogVisibleForReject = false
-    },
-    showInfo(sid, row) {
-      this.$nextTick(() => {
-        this.$refs['form_obj'].clearValidate()
-      })
-      this.viewTitle = '入账单详情'
-      console.log('编辑回显', sid, row)
-      req
-        .fetchBySid(sid)
-        .then(resp => {
-          const data = resp.data
-          this.formobj.applicationSid = data.applicationSid
-          this.formobj.applicationName = data.applicationName
-          this.formobj.applicationCode = data.applicationCode
-          this.formobj.remarks = data.remarks
-          this.formobj.sid = sid
-          this.formobj.configName = data.configName
-          this.formobj.configSid = data.configSid
-          this.formobj.departureDate = data.departureDate
-          this.formobj.modelName = data.modelName
-          this.formobj.modelSid = data.modelSid
-          this.formobj.purchaseOrderNo = data.purchaseOrderNo
-          this.formobj.vehicleOrderSid = data.vehicleOrderSid
-          this.formobj.taskDefKey = data.taskDefKey
-          this.formobj.taskId = data.taskId
-          this.formobj.nodeState = data.nodeState
-          if (data.inboundVehicleList.length > 0) {
-            data.inboundVehicleList.forEach(e => {
-              this.formobj.vehicleList.push({
-                applySid: e.applySid,
-                remarks: e.remarks,
-                modelSid: e.modelSid,
-                sid: e.sid,
-                vinNo: e.vinNo
-              })
-            })
-          }
-        })
-        .catch(e => {
-          this.formobj = row
-        })
-    },
-    // 同意
-    openAgree() {
-      this.formobj.comment = '同意'
-      // 查验下一环节要用到，流程定义的id
-      req.getNextNodesForSubmit(this.formobj).then(resp => {
-        if (resp.success) {
-          var arr = resp.data
-          this.nextNode = arr[0]
-          this.nodeDialogVisible = true
-        }
-        this.submitdisabled = false
-      })
-    },
-    /** 同意任务 */
-    handleAgree() {
-      if (!this.formobj.comment) {
-        alert('请填写审批意见!')
-        return
-      }
-      // 意见
-      // 下一环节的用户sid
-      // 调用后台接口流转
-      req.businessAgree(this.formobj).then(response => {
-        if (response.code === '200') {
-          this.nodeDialogVisible = false
-          // 子页面向父级页面传递值
-          window.parent.postMessage(
-            {
-              cmd: 'returnHeight',
-              params: {
-                // 操作成功，告诉父级页面关闭弹框
-                code: 1
-              }
-            },
-            '*'
-          )
-        } else {
-          this.$notify({
-            title: '提示',
-            message: '执行失败',
-            type: 'error',
-            duration: 2000
-          })
-        }
-      })
-    },
-    // 驳回
-    openReject() {
-      req.getPreviousNodesForReject(this.formobj).then(resp => {
-        if (resp.success) {
-          var arr = resp.data
-          // 循环获取当前环节的下一个环节信息
-          var startTask = arr[0].startTask
-          if (startTask) {
-            alert('当前环节不能驳回!')
-            return
-          }
-          this.nextNode = arr[0]
-          this.nodeDialogVisibleForReject = true
-        }
-      })
-    },
-    /** 驳回任务 */
-    handleReject() {
-      if (!this.formobj.comment) {
-        alert('请填写审批意见!')
-        return
-      }
-      this.regectList.comment = this.formobj.comment
-      req.rejectTask(this.regectList).then(response => {
-        if (response.code === '200') {
-          this.$notify({
-            title: '提示',
-            message: '执行成功',
-            type: 'success',
-            duration: 2000
-          })
-          this.nodeDialogVisibleForReject = false
-          window.parent.postMessage(
-            {
-              cmd: 'returnHeight',
-              params: {
-                code: 1
-              }
-            },
-            '*'
-          )
-          // this.refreshIt()
-        } else {
-          this.$notify({
-            title: '提示',
-            message: '执行失败',
-            type: 'error',
-            duration: 2000
-          })
-        }
-      })
-    },
-    // 终止
-    openStop() {
-      this.$confirm('是否确认执行终止操作', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => {
-          this.handleStop()
-        })
-        .catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消终止'
-          })
-        })
-    },
-    /** 确认撤回任务 */
-    openRevoke() {
-      this.$confirm('是否确认执行撤回操作', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => {
-          this.handleRevoke()
-        })
-        .catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消撤回'
-          })
-        })
-    },
-    /** 终止任务 */
-    handleStop() {
-      this.stopList.comment = this.dialogList.comment
-      req.breakTask(this.stopList).then(response => {
-        if (response.code === '200') {
-          window.parent.postMessage(
-            {
-              cmd: 'returnHeight',
-              params: {
-                // 操作成功，告诉父级页面关闭弹框
-                code: 1
-              }
-            },
-            '*'
-          )
-        } else {
-          this.$notify({
-            title: '提示',
-            message: '执行失败',
-            type: 'error',
-            duration: 2000
-          })
-        }
-      })
-    },
-    /** 撤回任务 */
-    handleRevoke() {
-      this.revokeList.comment = this.dialogList.comment
-      req.revokeTask(this.revokeList).then(response => {
-        if (response.code === '200') {
-          window.parent.postMessage(
-            {
-              cmd: 'returnHeight',
-              params: {
-                // 操作成功，告诉父级页面关闭弹框
-                code: 1
-              }
-            },
-            '*'
-          )
-        } else {
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-.wlInfo {
-  text-align: center;
-  font-size: 28px;
-  line-height: 90px;
-}
-.lineone {
-  border-bottom: 2px solid #e0e3eb;
-}
-.lineone .el-form-item {
-  margin-bottom: -10px;
-}
-.lineone >>> .el-input__inner {
-  border: 0;
-}
-.linetwo {
-  margin-top: 10px;
-}
-.linetwo .el-form-item {
-  margin-bottom: 0px !important;
-}
-.linetwo >>> .el-input__inner {
-  border: 0;
-}
-.tableStyle {
-  background-color: #ffffff;
-  display: flex;
-  justify-content: flex-start;
-  align-items: center;
-  border: 1px solid #dfe4ed;
-  height: 40px;
-}
-.el-form-item-right {
-  text-align: right;
-}
-.inputType {
-  width: 600px;
-}
-</style>
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue
new file mode 100644
index 0000000000..64dd8a1983
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue
@@ -0,0 +1,396 @@
+<template>
+  <div class="app-container">
+    <div>
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button type="danger" size="small" @click="openRevoke()">撤 回 </el-button>
+        </div>
+      </div>
+      <div class="listconadd">
+        <div class="titwu"><span>车辆入账申请单</span></div>
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
+          <el-row class="rowStyle">
+            <el-col :span="20" class="colOneStyle"></el-col>
+            <el-col :span="4" class="tleftb colOneStyle">
+              <span style="font-size: 16px">金额单位：元</span>
+            </el-col>
+          </el-row>
+          <el-row style="border-top: 1px solid #E0E3EB">
+            <el-col :span="3" class="tleftb"><span>分公司</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.useOrgName }}</el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb"><span>申请日期</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.applicationDate }}</el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb"><span>申请人</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.applicationName }}</el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>采购订单编号</span></el-col>
+            <el-col :span="21">
+              <el-form-item>{{ formobj.purchaseOrderNo }}</el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>车型</span></el-col>
+            <el-col :span="21">
+              <el-form-item>{{ formobj.modelName }}</el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>常用配置</span></el-col>
+            <el-col :span="21">
+              <el-form-item>{{ formobj.configName }}</el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>厂家合同价</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.contractPrice }}</el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb"><span>其中上装价格</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.amongSzPrice }}</el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb"><span>上装价格计算依据</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.szPriceCalBasis }}</el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8" class="tcenterb"><span>其中含运费</span></el-col>
+            <el-col :span="3" class="tleftb"><span>一次运费</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.onceFreight }}</el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb"><span>二次运费</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.secondaryFreight }}</el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">
+            <div>政策详情(含签单折让、开票下浮等)</div>
+            <el-checkbox disabled v-model="freightChecked"><span style="color: #FFFFFF">扣减运费</span></el-checkbox>
+          </div>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>政策1</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.policyOne }}</el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb"><span>可享受金额</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.eligibleAmountOne }}</el-form-item>
+            </el-col>
+            <el-col :span="8" class="tcenterb"><span>计算政策2时:<el-checkbox disabled style="padding-left: 5px" v-model="policyOneChecked">扣减政策1</el-checkbox></span><span style="padding-left: 15px">计算政策3时:<el-checkbox disabled style="padding-left: 5px" v-model="policyTwoChecked">扣减政策1</el-checkbox><el-checkbox disabled v-model="policyThreeChecked">扣减政策2</el-checkbox></span></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>政策2</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.policyTwo }}</el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb"><span>可享受比例（%）</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.eligibleProportionTwo }}</el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb"><span>对应金额</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.corrMoneyTwo }}</el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>政策3</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.policyThree }}</el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb"><span>可享受比例（%）</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.eligibleProportionThree }}</el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb"><span>对应金额</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.corrMoneyThree }}</el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>金额合计</span></el-col>
+            <el-col :span="5">
+              <el-form-item>{{ formobj.moneyCount }}</el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb"><span>政策备注</span></el-col>
+            <el-col :span="13">
+              <el-form-item>{{ formobj.policyRemarks }}</el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>厂家政策截图</span></el-col>
+            <el-col :span="21">
+              <div v-for="item in formobj.scmFiles" style="float: left">
+                <div style="display: flex;flex-direction: column;justify-content: center;align-items: center;" >
+                  <el-image style="cursor:pointer;width: 150px;height: 150px;margin-top: 5px" :src="item.filePath" @click="magnify(item.filePath)">
+                  </el-image>
+                </div>
+              </div>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>厂家结算价</span></el-col>
+            <el-col :span="21">
+              <el-form-item>{{ formobj.costPrice }}</el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">
+            <div>车辆列表</div>
+          </div>
+          <el-table :key="tableKey" :data="formobj.vehicleList" :index="index" border style="width: 100%">
+            <el-table-column fixed width="60px" label="序号" type="index" :index="index + 1" align="center" />
+            <el-table-column label="车架号" align="left" header-align="center">
+              <template slot-scope="scope" prop="vehicleName">
+                {{ scope.row.vinNo }}
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" header-align="center">
+              <template slot-scope="scope" prop="remarks">
+                {{ scope.row.remarks }}
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>厂家入库日期</span></el-col>
+            <el-col :span="9">
+              <el-form-item>{{ formobj.priceDate }}</el-form-item>
+            </el-col>
+            <el-col :span="3" class="tleftb"><span>厂家发车日期</span></el-col>
+            <el-col :span="9">
+              <el-form-item>{{ formobj.departureDate }}</el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb"><span>备注</span></el-col>
+            <el-col :span="21">
+              <el-form-item>{{ formobj.remarks }}</el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <el-dialog :visible.sync="dialogVisible">
+      <img width="100%" :src="dialogUrl" alt="">
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import req from '@/api/ruzhang/scmapplyinbound'
+
+export default {
+  name: 'ruzhangYiBanInfo',
+  data() {
+    return {
+      viewTitle: '',
+      index: 0,
+      tableKey: 0,
+      dialogVisible: false,
+      dialogUrl: '',
+      freightChecked: false, // 扣减运费
+      policyOneChecked: false, // 计算政策2： 扣减政策1
+      policyTwoChecked: false, // 计算政策3： 扣减政策1
+      policyThreeChecked: false, // 计算政策3： 扣减政策2
+      // 表单数据
+      formobj: {
+        amongSzPrice: '',
+        applicationCode: '',
+        applicationDate: '',
+        applicationName: '',
+        applicationSid: '',
+        configName: '',
+        configSid: '',
+        contractPrice: '',
+        corrMoneyThree: '',
+        corrMoneyTwo: '',
+        costPrice: '',
+        departureDate: '',
+        eligibleAmountOne: '',
+        eligibleProportionThree: '',
+        eligibleProportionTwo: '',
+        insideCode: '',
+        modelName: '',
+        modelSid: '',
+        moneyCount: '',
+        nodeState: '',
+        num: '',
+        onceFreight: '',
+        policyOne: '',
+        policyRemarks: '',
+        policyThree: '',
+        policyTwo: '',
+        priceDate: '',
+        purchaseOrderNo: '',
+        remarks: '',
+        secondaryFreight: '',
+        userSid: '',
+        useOrgName: '',
+        useOrgSid: '',
+        deductionFreight: '',
+        deductionPolicyThreeOne: '',
+        deductionPolicyThreeTwo: '',
+        deductionPolicyTwoOne: '',
+        scmFiles: [],
+        vehicleList: [],
+        vehicleOrderSid: ''
+      },
+      // 环节所需参数
+      linkByParameter: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        orgSidPath: '',
+        taskDefKey: '',
+        userSid: ''
+      },
+      rules: {},
+      submitdisabled: false
+    }
+  },
+  created() {
+    console.log('url:' + window.location.href)
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    console.log('iframe页面获取的obj:', obj)
+    // 点击（同意、终止、驳回、驳回）操作时所需的参数
+    this.linkByParameter.businessSid = obj.businessSid
+    this.linkByParameter.instanceId = obj.instanceId
+    this.linkByParameter.taskId = obj.taskId
+    this.linkByParameter.taskDefKey = obj.taskDefKey
+    this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
+    this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
+    this.current.taskDefKey = obj.taskDefKey
+    this.current.taskName = obj.taskName
+    // 加载表单数据
+    this.showInfo(obj.businessSid)
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: 400 + 'px'
+      }
+    }, '*')
+  },
+  methods: {
+    showInfo(sid, row) {
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      this.viewTitle = '入账单'
+      console.log('编辑回显', sid, row)
+      req.fetchBySid(sid).then(resp => {
+        const data = resp.data
+        this.formobj = data
+        if (this.formobj.deductionFreight === '0') {
+          this.freightChecked = true
+        } else {
+          this.freightChecked = false
+        }
+        if (this.formobj.deductionPolicyTwoOne === '0') {
+          this.policyOneChecked = true
+        } else {
+          this.policyOneChecked = false
+        }
+        if (this.formobj.deductionPolicyTwoOne === '0') {
+          this.policyTwoChecked = true
+        } else {
+          this.policyTwoChecked = false
+        }
+        if (this.formobj.deductionPolicyThreeTwo === '0') {
+          this.policyThreeChecked = true
+        } else {
+          this.policyThreeChecked = false
+        }
+      }).catch(e => {
+        this.formobj = row
+      })
+    },
+    magnify(val) {
+      this.dialogVisible = true
+      this.dialogUrl = val
+    },
+    /** 确认撤回任务 */
+    openRevoke() {
+      this.$confirm('是否确认执行撤回操作', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.handleRevoke()
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消撤回'
+        })
+      })
+    },
+    /** 撤回任务 */
+    handleRevoke() {
+      req.revokeProcess(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        } else {
+          this.$notify({
+            title: '提示',
+            message: '执行失败',
+            type: 'error',
+            duration: 2000
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.title {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.tcenterb {
+  text-align: center;
+  font-size: 14px;
+  color: #606266;
+  line-height: 40px !important;
+  font-weight: 600;
+}
+.rowStyle {
+  border-left: 0px;
+}
+.colOneStyle {
+  border-right: 0px !important;
+  border-bottom: 0px !important;
+}
+.freight {
+  color: #FFFFFF;
+}
+</style>