From a706d9b8180b267b5d30bdeaa784f34bf0c164e6 Mon Sep 17 00:00:00 2001
From: Zhao Qiqi <1287235164@qq.com>
Date: Tue, 19 Jul 2022 17:31:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=EF=BC=88?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=87=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=90=8E=E7=9A=8402=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/ButtonBar/index.vue        |  14 +-
 .../src/components/tab-search/index.vue       |  10 +-
 .../src/styles/anrui-button.scss              |  14 +
 .../anrui-base-ui/src/styles/index.scss       |   1 +
 .../anrui-base-ui/src/styles/upload.vue       | 194 ---------
 .../changshangguanli/changshangguanli.vue     |   8 +-
 .../views/zhongjierenyuan/zhongjierenyuan.vue | 227 ++++------
 .../zhongjierenyuan/zhongjierenyuanAdd.vue    | 190 ++++-----
 .../zhongjierenyuan/zhongjierenyuanInfo.vue   |  66 ++-
 .../kehugenjinjilu/genjinjiluguanli.vue       |   3 +-
 .../kehuziliao/kehudanganziliao.vue           |   2 +-
 .../src/api/flow/tiaozhangshenqing.js         |   7 +
 .../src/router/modules/codemenu.js            |  15 +
 .../cheliangtaizhang/cheliangtaizhangAdd.vue  |  47 +--
 .../cheliangtaizhang/cheliangtaizhangInfo.vue | 151 +++++--
 .../yanchejianchaxiangmu/yanchejiancha.vue    |  13 +
 .../yanchejianchaxiangmu/yanchejianchaAdd.vue |  13 +
 .../yanchejianchaInfo.vue                     |  13 +
 .../tiaozhangshenqingOrgChange.vue            | 397 ++++++++++++++++++
 19 files changed, 827 insertions(+), 558 deletions(-)
 create mode 100644 anrui-base/anrui-base-ui/src/styles/anrui-button.scss
 delete mode 100644 anrui-base/anrui-base-ui/src/styles/upload.vue
 create mode 100644 anrui-scm/anrui-scm-ui/src/views/supplychain/yanchejianchaxiangmu/yanchejiancha.vue
 create mode 100644 anrui-scm/anrui-scm-ui/src/views/supplychain/yanchejianchaxiangmu/yanchejianchaAdd.vue
 create mode 100644 anrui-scm/anrui-scm-ui/src/views/supplychain/yanchejianchaxiangmu/yanchejianchaInfo.vue
 create mode 100644 anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqingOrgChange.vue

diff --git a/anrui-base/anrui-base-ui/src/components/ButtonBar/index.vue b/anrui-base/anrui-base-ui/src/components/ButtonBar/index.vue
index d5546a8afa..ff2cf3743f 100644
--- a/anrui-base/anrui-base-ui/src/components/ButtonBar/index.vue
+++ b/anrui-base/anrui-base-ui/src/components/ButtonBar/index.vue
@@ -30,49 +30,49 @@ export default {
       btnList: [
         {
           type: 'primary',
-          size: 'small',
+          size: 'medium',
           icon: 'plus',
           btnKey: 'toAdd',
           btnLabel: '新增'
         },
         {
           type: 'primary',
-          size: 'small',
+          size: 'medium',
           icon: 'edit',
           btnKey: 'toEdit',
           btnLabel: '编辑'
         },
         {
           type: 'primary',
-          size: 'small',
+          size: 'medium',
           icon: 'submit',
           btnKey: 'doSubmit',
           btnLabel: '提交'
         },
         {
           type: 'danger',
-          size: 'small',
+          size: 'medium',
           icon: 'del',
           btnKey: 'doDel',
           btnLabel: '删除'
         },
         {
           type: 'success',
-          size: 'small',
+          size: 'medium',
           icon: 'Import',
           btnKey: 'doImport',
           btnLabel: '导入'
         },
         {
           type: 'success',
-          size: 'small',
+          size: 'medium',
           icon: 'export',
           btnKey: 'build',
           btnLabel: '导出'
         },
         {
           type: 'info',
-          size: 'small',
+          size: 'medium',
           icon: 'cross',
           btnKey: 'doClose',
           btnLabel: '关闭'
diff --git a/anrui-base/anrui-base-ui/src/components/tab-search/index.vue b/anrui-base/anrui-base-ui/src/components/tab-search/index.vue
index f58c63cb3a..38177d7946 100644
--- a/anrui-base/anrui-base-ui/src/components/tab-search/index.vue
+++ b/anrui-base/anrui-base-ui/src/components/tab-search/index.vue
@@ -68,11 +68,11 @@
 					border-color: $border-color;
 				}
 			}
-			.el-button{
-				padding: 8px 20px;
-				// background-color: $color-primary;
-				// color: $text-color-inverse;
-			}
+			// .el-button{
+			// 	padding: 8px 20px;
+			// 	// background-color: $color-primary;
+			// 	// color: $text-color-inverse;
+			// }
 			.el-select{
 				width: 150px;
 			}
diff --git a/anrui-base/anrui-base-ui/src/styles/anrui-button.scss b/anrui-base/anrui-base-ui/src/styles/anrui-button.scss
new file mode 100644
index 0000000000..eed676cfe6
--- /dev/null
+++ b/anrui-base/anrui-base-ui/src/styles/anrui-button.scss
@@ -0,0 +1,14 @@
+.el-button--medium {
+    padding: 10px 14px;
+    font-size: 16px;
+  }
+  
+  .el-button--small {
+    padding: 7px 12px;
+    font-size: 14px;
+  }
+  
+  .el-button--mini {
+    padding: 5px 10px;
+    font-size: 12px;
+  }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-ui/src/styles/index.scss b/anrui-base/anrui-base-ui/src/styles/index.scss
index 00a5696f1f..a87c52ba54 100644
--- a/anrui-base/anrui-base-ui/src/styles/index.scss
+++ b/anrui-base/anrui-base-ui/src/styles/index.scss
@@ -7,6 +7,7 @@
 @import './e-table.scss';
 @import './element-table.scss';
 @import './element-tabs.scss';
+@import './anrui-button.scss';
 body {
   height: 100%;
   -moz-osx-font-smoothing: grayscale;
diff --git a/anrui-base/anrui-base-ui/src/styles/upload.vue b/anrui-base/anrui-base-ui/src/styles/upload.vue
deleted file mode 100644
index d4418a8200..0000000000
--- a/anrui-base/anrui-base-ui/src/styles/upload.vue
+++ /dev/null
@@ -1,194 +0,0 @@
-<template>
-  <div>
-    <el-upload class="upload-demo" :data="datas" :accept="accept" :on-success="uploadImgSuccess" :on-change="handleChange" :on-remove="handleRemove" :file-list="fileList_FuJian" :http-request="uploadSectionFile">
-      <el-button size="small" type="primary">点击上传</el-button>
-      <div slot="tip" class="el-upload__tip">单个文件大小不允许超过100M,支持上传文件类型：{{ accept }}</div>
-    </el-upload>
-  </div>
-</template>
-
-<script>
-import { imgUploadz } from '@/api/jichuxinxi/baseaffiliatcompany'
-import { mapGetters } from 'vuex'
-export default {
-  props: {
-    placeholder: {
-      type: String,
-      default: '',
-    },
-    // 长度
-    width: {
-      type: String,
-      default: '270px',
-    },
-    accept: {
-      type: String,
-      default:
-        '.jpg,.jpeg,.png,.bmp,.pdf,.JPG,.JPEG,.BMP,.PDF,.xls,.docx,.xlsx,.ppt,.pptx',
-    },
-    // 文件列表
-    files: {
-      type: String,
-      required: true,
-    },
-    // 文件名称
-    name: {
-      type: String,
-      required: true,
-    },
-    types:{
-      type:String,
-      required: true,
-    },
-    linkChange: {
-      type: String,
-      default: '',
-    },
-  },
-  data() {
-    return {
-      datas: null,
-      types:types,
-      accessToken: {},
-      fileList_FuJian: [],
-      enclosure: '',
-      file_add: '',
-      idsz: '',
-      file_catch: '',
-      files_list: [],
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'id',
-      'departmentCode',
-      'departmentLevel',
-      'departmentType',
-      'token',
-    ]),
-  },
-  watch: {
-    files: {
-      deep: true,
-      handler(val) {
-        this.pageLoad(val, '')
-      },
-    },
-  },
-  creatd() {
-    this.datas = { type: this.types }
-    // console.log(this.datas,7777777)
-    console.log(this.type, '船只被')
-  },
-  mounted() {
-    this.$nextTick(() => {
-      // this.Init()
-    })
-  },
-  methods: {
-    // 页面第一次加载
-    Init() {
-      // 1. 文件上传用token
-      // this.accessToken = {
-      //   token: this.token,
-      // }
-      this.pageLoad(this.files)
-    },
-    handleChange(file, fileList) {
-    },
-    // 传入数据并绑定
-    pageLoad(files) {
-      // console.log('传入：' + files)
-      if (files !== null && files !== '') {
-        this.files_list = JSON.parse(files)
-        var ids = ''
-        this.fileList_FuJian = []
-        // 1. 回显页面
-        for (var i = 0; i < this.files_list.length; i++) {
-          var body = {
-            name: this.files_list[i].name,
-            url: '',
-            status: 'finished',
-          }
-          this.fileList_FuJian.push(body)
-          ids = ids + this.files_list[i].id + ','
-        }
-        // 2. 回存文件id
-        if (ids !== '') {
-          ids = ids.substring(0, ids.length - 1)
-        }
-        this.enclosure = ids
-        this.file_catch = ids
-      } else {
-        this.file_add = ''
-        this.file_catch = ''
-        this.enclosure = ''
-        this.files_list = []
-        this.fileList_FuJian = []
-      }
-    },
-    // 上传方案--成功后执行
-    uploadImgSuccess(response, file, fileList) {
-      // console.log('fileList:' + JSON.stringify(fileList))
-
-      // this.enclosure = ''
-      // 1. 保存新增文件id(this.file_add)
-      // this.getNewFileId(fileList)
-      // 2. 保存并拼接id
-      // this.getFileId()
-      // console.log('4. 返回拼接：' + this.enclosure)
-      // 3. 返回拼接id
-      this.$emit('change', this.enclosure)
-    },
-    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
-      if (this.idsz != '') {
-        this.$emit('handleRemove', this.idsz)
-      }
-    },
-    // 上传文件 FrontPhoto
-    uploadSectionFile(params) {
-      const file = params.file
-      // 根据后台需求数据格式
-      const form = new FormData()
-      console.log('77777777777777',form)
-      // 文件对象
-      form.append('file', file)
-      // 项目封装的请求方法，下面做简单介绍
-      console.log('988888',form.append)
-      imgUploadz(form).then((res) => {
-          // 自行处理各种情况
-          if (res.code === '200') {
-            res.data.attachType = this.types
-            let a = ''
-            a = res.data.filePath
-            this.idsz = a
-            this.$emit('handleSuccess', res)
-          }
-          // this.FrontPhoto = res.fullUrl
-          if (res.msg == '操作成功') {
-            this.$message({
-              message: '上传成功！',
-              type: 'success',
-            })
-          }
-        })
-        .catch((err) => {
-          console.log(err)
-          // 如果等于备案,就调备案图片上传接口
-        })
-    },
-  },
-}
-</script>
-
-<style lang="scss" scoped></style>
diff --git a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue
index dec7480764..dd883568b6 100644
--- a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue
+++ b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue
@@ -177,28 +177,28 @@ export default {
       btnList: [
         {
           type: 'primary',
-          size: 'small',
+          size: 'medium',
           icon: 'plus',
           btnKey: 'toAdd',
           btnLabel: '新增'
         },
         {
           type: 'danger',
-          size: 'small',
+          size: 'medium',
           icon: 'del',
           btnKey: 'doDel',
           btnLabel: '删除'
         },
         {
           type: 'success',
-          size: 'small',
+          size: 'medium',
           icon: 'export',
           btnKey: 'build',
           btnLabel: '导出'
         },
         {
           type: 'info',
-          size: 'small',
+          size: 'medium',
           icon: 'cross',
           btnKey: 'doClose',
           btnLabel: '关闭'
diff --git a/anrui-base/anrui-base-ui/src/views/zhongjierenyuan/zhongjierenyuan.vue b/anrui-base/anrui-base-ui/src/views/zhongjierenyuan/zhongjierenyuan.vue
index 923cc622bc..e04c6a3bc8 100644
--- a/anrui-base/anrui-base-ui/src/views/zhongjierenyuan/zhongjierenyuan.vue
+++ b/anrui-base/anrui-base-ui/src/views/zhongjierenyuan/zhongjierenyuan.vue
@@ -1,23 +1,20 @@
 <template>
   <div class="app-container">
-    <div v-show="viewState ==1">
+    <div v-show="viewState == 1">
       <button-bar view-title="中介人员管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
       <div class="main-content">
         <div class="searchcon">
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
           <div v-show="isSearchShow" class="search">
-            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="130px" class="tab-header">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="80px" class="tab-header">
               <el-form-item label="姓名">
                 <el-input v-model="listQuery.params.name" placeholder="" clearable class="filter-item"/>
               </el-form-item>
               <el-form-item label="手机号码">
-                <el-input v-model="listQuery.params.phone" placeholder="" clearable class="filter-item"/>
+                <el-input v-model="listQuery.params.mobile" placeholder="" clearable class="filter-item"/>
               </el-form-item>
               <el-form-item label="所在单位">
-                <el-select v-model="listQuery.params.disLevelKey" class="filter-item" clearable placeholder="请选择">
-                  <el-option v-for="item in disLevel_list" :key="item.dictKey" :label="item.dictValue"
-                             :value="item.dictKey"/>
-                </el-select>
+                <el-input v-model="listQuery.params.company" placeholder="" clearable class="filter-item"/>
               </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
@@ -44,32 +41,32 @@
             </el-table-column>
             <el-table-column width="130" label="姓名" align="center">
               <template slot-scope="scope">
-<!--                <span>{{ scope.row.disName }}</span>-->
+               <span>{{ scope.row.name }}</span>
               </template>
             </el-table-column>
             <el-table-column width="130" label="手机号" align="center">
               <template slot-scope="scope">
-                <span class="bluezi" @click="handleCheck(scope.row)">{{ scope.row.invoBank }}</span>
+                <span class="bluezi" @click="handleCheck(scope.row)">{{ scope.row.mobile }}</span>
               </template>
             </el-table-column>
             <el-table-column width="200" label="开户行" align="center">
               <template slot-scope="scope">
-<!--                <span>{{ scope.row.invoBank }}</span>-->
+               <span>{{ scope.row.bankName }}</span>
               </template>
             </el-table-column>
             <el-table-column width="200" label="银行账号" align="center">
               <template slot-scope="scope">
-<!--                <span>{{ scope.row.invoBankNum }}</span>-->
+               <span>{{ scope.row.bankAccount }}</span>
               </template>
             </el-table-column>
             <el-table-column width="220" label="所在单位" align="center">
               <template slot-scope="scope">
-<!--                <span>{{ scope.row.setUpTime }}</span>-->
+               <span>{{ scope.row.company }}</span>
               </template>
             </el-table-column>
             <el-table-column label="备注" align="left" header-align="center">
               <template slot-scope="scope">
-<!--                <span>{{ scope.row.isGuarantee }}</span>-->
+               <span>{{ scope.row.remarks }}</span>
               </template>
             </el-table-column>
           </el-table>
@@ -90,14 +87,13 @@
 </template>
 
 <script>
-import {setuser} from '@/utils/baocun'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar/index.vue'
-import {getUseOrgByUserSid} from "@/api/jichuxinxi/brandManagement";
-import {deleteBySids, getOneLevelList, pagerList, typeValues} from "@/api/jichuxinxi/baseaffiliatcompany";
-import ZhongjierenyuanAdd from "@/views/zhongjierenyuan/zhongjierenyuanAdd";
-import ZhongjierenyuanInfo from "@/views/zhongjierenyuan/zhongjierenyuanInfo";
+import ZhongjierenyuanAdd from "@/views/zhongjierenyuan/zhongjierenyuanAdd"
+import ZhongjierenyuanInfo from "@/views/zhongjierenyuan/zhongjierenyuanInfo"
+import { listPage, deleteBySids } from '@/api/business/intermediaryPerson.js'
+import {typeValues} from "@/api/jichuxinxi/dictcommons"
 
 export default {
   name: "zhongjierenyuan",
@@ -163,15 +159,10 @@ export default {
       }],
       listQuery: {
         params: {
-          createOrg: '',
-          disName: '',	//经销商名称
-          isGuarantee: '',	//是否担保 0是/1否
-          legalName: '',	//实际控制人姓名
-          registNum: '',	//统一社会信用代码
-          disLevel: '', // 级别
-          pdistributorSid: '',
-          setUpEndTime: '',	//成立结束时间
-          setUpStartTime: ''	// 成立开始时间
+          name:'',
+          company:'',
+          mobile:'',
+          userSid:window.sessionStorage.getItem('userSid')
         },
         total: 0,
         current: 1,
@@ -181,7 +172,6 @@ export default {
       sdies: '',
       dialogFormVisible: false, // 添加修改对话框状态
       dialogFormShowVisible: false, // 查看对话框默认关闭状态
-      dialogStatus: '', // 对话框状态
       disLevel_list: [] // 级别
     }
   },
@@ -192,7 +182,7 @@ export default {
     // 初始化变量
     this.init()
     // 加载列表
-    this.getListOrgAll()
+    this.getList()
   },
   methods: {
     // 搜索条件效果
@@ -223,22 +213,62 @@ export default {
           break
       }
     },
-    // 序号
-    indexMethod(index) {
-      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
-      var pageindex = index + 1 + pagestart
-      return pageindex
+    // 打开添加
+    toAdd() {
+      this.viewState = 2
+      this.$refs['divAdd'].showAdd()
     },
-    getListOrgAll(state) {
-      const userSid = window.sessionStorage.getItem('userSid')
-      getUseOrgByUserSid({userSid: userSid}).then((res) => {
-        if (res.success) {
-          console.log('获取当前使用人分公司', res.data)
-          this.listQuery.params.relationState = state
-          this.listQuery.params.createOrg = res.data.sid
-          this.getList()
-        }
-      })
+    // 根据本行ID删除数据
+    doDel() {
+      if (this.sids.length > 0) {
+        const _this = this
+        const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
+        this.$confirm(tip, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+          .then(() => {
+            const loading = this.$loading({
+              lock: true,
+              text: 'Loading',
+              spinner: 'el-icon-loading',
+              background: 'rgba(0, 0, 0, 0.7)'
+            })
+            deleteBySids(this.sids)
+              .then(resp => {
+                if (resp.success && resp.code == '200') {
+                  loading.close()
+                  _this.$message({type: 'success', message: resp.msg, showClose: true})
+                  _this.getList()
+                } else {
+                  loading.close()
+                  // _this.$message({ type: 'error', message: resp.msg, showClose: true })
+                }
+              })
+              .catch(e => {
+                loading.close()
+              })
+          })
+          .catch(() => {
+          })
+      } else {
+        this.$message({
+          showClose: true,
+          type: 'error',
+          message: '请选择至少一条记录进行删除操作'
+          })
+        return
+      }
+    },
+    handleEdit(row) {
+      this.viewState = 3
+      this.$refs['divAdd'].showEdit(row.sid)
+    },
+    // 打开查看
+    handleCheck(row) {
+      this.viewState = 4
+      this.$refs['divInfo'].showInfo(row.sid)
     },
     // 获取数据字典
     getType() {
@@ -248,20 +278,16 @@ export default {
         }
       })
     },
-    getLevelList(){
-      getOneLevelList({sid:''}).then((res) => {
-        if (res.code === '200') {
-          this.pDistributorSid_list = res.data
-        }
-      })
-    },
-    relationStateChange(val){
-      this.getListOrgAll(val)
+    // 序号
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
     },
     // 查询列表信息
     getList() {
       this.listLoading = true
-      pagerList(this.listQuery).then((response) => {
+      listPage(this.listQuery).then((response) => {
         console.log('列表查询结果1：', response)
         console.log('列表查询结果：' + JSON.stringify(response))
         this.listLoading = false
@@ -271,118 +297,39 @@ export default {
           response.data.total > 0
         ) {
           this.list = response.data.records
-          for (var i = 0; i < this.list.length; i++) {
-            if (this.list[i].isGuarantee == '1') {
-              this.list[i].isGuarantee = '是'
-            } else if (this.list[i].isGuarantee == '0') {
-              this.list[i].isGuarantee = '否'
-            }
-          }
           this.listQuery.total = response.data.total
         } else {
           this.list = []
           this.listQuery.total = 0
         }
       })
-      this.getLevelList()
     },
     // 查询按钮
     handleFilter() {
       this.listQuery.current = 1
-      this.getListOrgAll()
+      this.getList()
     },
     handleReset() {
       this.listQuery = {
         params: {
-          disName: '',	//经销商名称
-          isGuarantee: '',	//是否担保 0是/1否
-          legalName: '',	//实际控制人姓名
-          registNum: '',	//统一社会信用代码
-          disLevel: '', // 级别
-          pdistributorSid: '',
-          setUpEndTime: '',	//成立结束时间
-          setUpStartTime: ''	// 成立开始时间
+          name:'',
+          company:'',
+          mobile:'',
+          userSid:window.sessionStorage.getItem('userSid')
         },
         total: 0,
         current: 1,
         size: 10
       }
-      this.getListOrgAll()
+      this.getList()
     },
     handleSelectionChange(row) {
       const aa = []
       row.forEach((element) => {
         aa.push(element.sid)
-        setuser(this.sids)
       })
       this.sids = aa
-      this.sdies = this.sids.join()
-      console.log('this.sids000000', this.sdies)
-    },
-    // 打开添加
-    toAdd() {
-      this.viewState = 2
-      this.$refs['divAdd'].showAdd()
-    },
-    // 打开任务
-    handleRenwu() {
-      this.$router.push({
-        path: '/guakaogongsi/renwu'
-      })
-    },
-    handleEdit(row) {
-      this.dialogStatus = 'update'
-      this.viewState = 3
-      this.$refs['divAdd'].showEdit(row.sid)
-    },
-    // 打开查看
-    handleCheck(scope) {
-      this.viewState = 4
-      this.$refs['divInfo'].showInfo(scope.sid)
-    },
-    // 根据本行ID删除数据
-    doDel() {
-      if (this.sdies.length > 0) {
-        const _this = this
-        const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
-        this.$confirm(tip, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        })
-          .then(() => {
-            const loading = this.$loading({
-              lock: true,
-              text: 'Loading',
-              spinner: 'el-icon-loading',
-              background: 'rgba(0, 0, 0, 0.7)'
-            })
-            deleteBySids({sids:this.sdies})
-              .then(resp => {
-                if (resp.success && resp.code == '200') {
-                  loading.close()
-                  _this.$message({type: 'success', message: resp.msg, showClose: true})
-                  _this.getListOrgAll()
-                } else {
-                  loading.close()
-                  // _this.$message({ type: 'error', message: resp.msg, showClose: true })
-                }
-              })
-              .catch(e => {
-                loading.close()
-              })
-          })
-          .catch(() => {
-          })
-      } else {
-        this.$notify({
-          title: '提示',
-          message: '没有选择经销商信息!!',
-          type: 'error',
-          duration: 2000
-        })
-        return
-      }
+      console.log('this.sids', this.sids)
     },
     resetState() {
       this.viewState = 1
diff --git a/anrui-base/anrui-base-ui/src/views/zhongjierenyuan/zhongjierenyuanAdd.vue b/anrui-base/anrui-base-ui/src/views/zhongjierenyuan/zhongjierenyuanAdd.vue
index a47608b859..a2c66f9752 100644
--- a/anrui-base/anrui-base-ui/src/views/zhongjierenyuan/zhongjierenyuanAdd.vue
+++ b/anrui-base/anrui-base-ui/src/views/zhongjierenyuan/zhongjierenyuanAdd.vue
@@ -3,7 +3,7 @@
     <div class="tab-header webtop">
       <div>{{ viewTitle }}</div>
       <div>
-        <el-button type="primary" size="small" @click="handleCreate()">保存</el-button>
+        <el-button type="primary" size="small" :disabled="createBtn" @click="handleCreate()">保存</el-button>
         <el-button type="info" size="small" @click="handleReturn()">返回</el-button>
       </div>
     </div>
@@ -22,8 +22,8 @@
             <span>手机号码</span>
           </el-col>
           <el-col :span="9">
-            <el-form-item>
-              <el-input v-model="temp.phone" maxlength="125" placeholder="" class="addinputw" clearable/>
+            <el-form-item prop="mobile">
+              <el-input v-model="temp.mobile" maxlength="11" placeholder="" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -33,7 +33,7 @@
           </el-col>
           <el-col :span="9">
             <el-form-item>
-              <el-input v-model="temp.remarks" maxlength="125" placeholder="" class="addinputw" clearable/>
+              <el-input v-model="temp.bankName" maxlength="125" placeholder="" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
           <el-col :span="3">
@@ -41,7 +41,8 @@
           </el-col>
           <el-col :span="9">
             <el-form-item>
-              <el-input v-model="temp.disName" maxlength="125" placeholder="" class="addinputw" clearable/>
+              <el-input v-model="temp.bankAccount" maxlength="20" placeholder="" class="addinputw" clearable
+                        oninput="value=value.replace(/[^\d]/g,'')"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -51,10 +52,7 @@
           </el-col>
           <el-col :span="21">
             <el-form-item>
-              <el-select v-model="temp.kuwei" placeholder="请选择" filterable clearable class="addinputw">
-                <el-option v-for="item in kuwei_list" :key="item.dictKey" :label="item.dictValue"
-                           :value="item.dictKey"/>
-              </el-select>
+              <el-input v-model="temp.company" placeholder="" clearable class="filter-item"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -64,7 +62,7 @@
           </el-col>
           <el-col :span="21">
             <el-form-item>
-              <el-input v-model="temp.remarks" type="textarea" maxlength="125" placeholder="" class="addinputw" clearable/>
+              <el-input v-model="temp.remarks" type="textarea" maxlength="125" placeholder="" class="filter-item" clearable/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -74,27 +72,44 @@
 </template>
 
 <script>
+import { save, details } from '@/api/business/intermediaryPerson.js'
+import {typeValues} from "@/api/jichuxinxi/dictcommons"
+
 export default {
   name: "zhongjierenyuanAdd",
   data() {
+    var checkMobile = (rule, value, callback) => {
+      const mobile = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
+      if (value) {
+        // 如果没有通过验证！！
+        if (!mobile.test(value)) {
+          callback(new Error("请输入正确的手机号码"));
+          }
+          callback();
+          } else {
+            callback();
+          }
+    }
     return {
       viewTitle: '',
       // --按钮菜单-------
       sid: '',
-      datas: null,
       stateId: 0,
-      FormLoading: false,
-      listLoading: false,
       kuwei_list: [],
-      imgList: [], // 附件上传
+      createBtn:false,
       temp: {
-        orderType: '01'
+       bankAccount:'',	 // 银行账号
+       bankName:'',	 // 开户行
+       company:'',	 // 所在单位
+       createBySid:'',	 // 用户sid
+       mobile:'',	 // 手机号
+       name:'',	 // 姓名
+       remarks:'',
+       sid:''
       }, // 添加和修改
-      dialogFormVisible: false, // 添加修改对话框状态
-      dialogFormShowVisible: false, // 查看对话框默认关闭状态
-      dialogStatus: '', // 对话框状态
-      vehiclePhoto: [],
-      rules: {}
+      rules: {
+        mobile: [{ required: true, validator: checkMobile, trigger: 'blur' }],
+      }
       // ------------------------------------
     }
   },
@@ -109,121 +124,67 @@ export default {
       //   }
       // })
     },
-    // kuweiChange(val) {
-    //   const choosetItem = this.kuwei_list.filter((item) => item.dictKey == val)
-    //   this.temp.dictValue = choosetItem[0].kuwei
-    //   console.log('name:', , 'key:', )
-    // },
+    // 获得所在单位
+
     showAdd() {
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
       this.dialogStatus = 'add'
-      this.viewTitle = '【新增】中介人'
+      this.viewTitle = '【新增】中介人员'
+      this.getType()
     },
     showEdit(sid) {
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
       this.dialogStatus = 'edit'
-      this.viewTitle = '【修改】车辆台账'
-      //   this.temp.sid = sid
-      //   console.log('修改页面sid', this.temp.sid)
-      //   details(sid).then((response) => {
-      //     if (response.code === '200') {
-      //       if (response.data.createOrg) {
-      //         console.log('级联选择1：', response.data.useOrg)
-      //         this.useOrgArry = response.data.createOrg
-      //         console.log('级联选择2：', this.useOrgArry)
-      //       }
-      //       this.temp = response.data
-      //       this.getLocation()
-      //       this.getModelConfig(this.temp.modelSid)
-      //     }
-      //   })
-      //   this.getType()
-      //   this.getZuZhi()
-      //   this.getUseOrg()
-    },
-    // 获得使用组织
-    getUseOrg() {
-      const userSid = window.sessionStorage.getItem('userSid')
-      getUseOrgByUserSid({userSid: userSid}).then((res) => {
-        if (res.success) {
-          this.temp.useOrgName = res.data.name
-          this.temp.useOrg = res.data.sid
-          this.temp.createOrg = res.data.sid
-          this.temp.createOrgName = res.data.name
-          this.org_list = res.data
-        }
-      })
-    },
-    getPathSid() {
-      const userSid = window.sessionStorage.getItem('userSid')
-      getPathSidByUserSid({userSid: userSid}).then((res) => {
-        if (res.code === '200') {
-          this.listQuery.params.createOrgSId = res.data
-          this.useOrg = res.data
+      this.viewTitle = '【修改】中介人员'
+      this.temp.sid = sid
+      console.log('修改页面sid', this.temp.sid)
+      details(sid).then((response) => {
+        if (response.success) {
+          this.temp = response.data
         }
       })
-    },
-    getUrl() {
-      if (this.imgList.length > 0) {
-        console.log('imgList', this.imgList)
-      } else {
-
-      }
-
-    },
-    // ----------------------------------方法--------------------
-    // 返回
-    handleReturn(isreload) {
-      if (isreload === 'true') this.$emit('reloadlist')
-      this.temp = {
-        orderType: '01'
-      }
-      this.$emit('doback')
+      this.getType()
     },
     // 提交添加数据
     handleCreate() {
-      console.log('this.temp.useOrg', this.useOrgArry)
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          this.FormLoading = true
+          this.createBtn = true
           // 只需添加和修改
-          if (this.dialogStatus === 'add') {
-            // SaveList(this.temp).then((response) => {
-            //   this.FormLoading = false
-            //   if (response.code === '200') {
-            //     setChe(response.data)
-            //     this.dialogFormVisible = false
-            //     this.handleReturn('true')
-            //   } else {
-            //     this.$message({
-            //       showClose: true,
-            //       message: '添加失败！',
-            //       type: 'error'
-            //     });
-            //   }
-            // })
-          } else {
-            // Update(this.temp).then((response) => {
-            //   this.FormLoading = false
-            //   if (response.code === '200') {
-            //     this.dialogFormVisible = false
-            //     this.handleReturn('true')
-            //   } else {
-            //     this.$message({
-            //       showClose: true,
-            //       message: '修改失败！',
-            //       type: 'error'
-            //     });
-            //   }
-            // })
-          }
+            save(this.temp).then((response) => {
+              this.createBtn = false
+              if (response.success) {
+                this.handleReturn('true')
+              } else {
+                this.$message({
+                  showClose: true,
+                  message: '添加失败！',
+                  type: 'error'
+                });
+              }
+            })
         }
       })
     },
+    // 返回
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
+      this.temp = {
+       bankAccount:'',	 // 银行账号
+       bankName:'',	 // 开户行
+       company:'',	 // 所在单位
+       createBySid:'',	 // 用户sid
+       mobile:'',	 // 手机号
+       name:'',	 // 姓名
+       remarks:'',
+       sid:''
+      },
+      this.$emit('doback')
+    }
   }
 }
 </script>
@@ -262,4 +223,7 @@ export default {
   line-height: 40px !important;
   font-weight: 600;
 }
+.filter-item{
+  width: 93%;
+}
 </style>
diff --git a/anrui-base/anrui-base-ui/src/views/zhongjierenyuan/zhongjierenyuanInfo.vue b/anrui-base/anrui-base-ui/src/views/zhongjierenyuan/zhongjierenyuanInfo.vue
index ebae302ecb..65d8dbba73 100644
--- a/anrui-base/anrui-base-ui/src/views/zhongjierenyuan/zhongjierenyuanInfo.vue
+++ b/anrui-base/anrui-base-ui/src/views/zhongjierenyuan/zhongjierenyuanInfo.vue
@@ -1,13 +1,13 @@
 <template>
   <div class="app-container">
     <div class="tab-header webtop">
-      <div>中介人详情</div>
+      <div>中介人员详情</div>
       <div>
         <el-button type="info" size="small" @click="handleReturn()">返回</el-button>
       </div>
     </div>
     <div class="listconadd">
-      <el-form ref="dataForm" :model="temp" label-position="right" class="formadd" :rules="rules">
+      <el-form ref="dataForm" :model="temp" label-position="right" class="formadd">
         <el-row style="border-top: 1px solid #e0e3eb;">
           <el-col :span="3">
             <span>姓名</span>
@@ -22,7 +22,7 @@
           </el-col>
           <el-col :span="9">
             <el-form-item>
-              <span>{{temp.phone}}</span>
+              <span>{{temp.mobile}}</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -32,7 +32,7 @@
           </el-col>
           <el-col :span="9">
             <el-form-item>
-              <span>{{temp.phone}}</span>
+              <span>{{temp.bankName}}</span>
             </el-form-item>
           </el-col>
           <el-col :span="3">
@@ -40,7 +40,7 @@
           </el-col>
           <el-col :span="9">
             <el-form-item>
-              <span>{{temp.phone}}</span>
+              <span>{{temp.bankAccount}}</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -50,7 +50,7 @@
           </el-col>
           <el-col :span="21">
             <el-form-item>
-              <span>{{temp.phone}}</span>
+              <span>{{temp.company}}</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -70,28 +70,16 @@
 </template>
 
 <script>
+import { details } from '@/api/business/intermediaryPerson.js'
+
+
 export default {
   name: "zhongjierenyuanInfo",
   data() {
     return {
-      viewTitle: '',
-      // --按钮菜单-------
       sid: '',
-      datas: null,
-      stateId: 0,
-      FormLoading: false,
-      listLoading: false,
-      kuwei_list:[],
-      imgList: [], // 附件上传
       temp: {
-        orderType: '01'
       }, // 添加和修改
-      dialogFormVisible: false, // 添加修改对话框状态
-      dialogFormShowVisible: false, // 查看对话框默认关闭状态
-      dialogStatus: '', // 对话框状态
-      vehiclePhoto: [],
-      rules: {}
-      // ------------------------------------
     }
   },
   methods: {
@@ -99,29 +87,25 @@ export default {
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
-      this.dialogStatus = 'edit'
-      this.viewTitle = '【修改】车辆台账'
-      //   this.temp.sid = sid
-      //   console.log('修改页面sid', this.temp.sid)
-      //   details(sid).then((response) => {
-      //     if (response.code === '200') {
-      //       if (response.data.createOrg) {
-      //         console.log('级联选择1：', response.data.useOrg)
-      //         this.useOrgArry = response.data.createOrg
-      //         console.log('级联选择2：', this.useOrgArry)
-      //       }
-      //       this.temp = response.data
-      //       this.getLocation()
-      //       this.getModelConfig(this.temp.modelSid)
-      //     }
-      //   })
-      //   this.getType()
-      //   this.getZuZhi()
-      //   this.getUseOrg()
+      console.log('修改页面sid', this.temp.sid)
+      details(sid).then((response) => {
+        if (response.success) {
+          this.temp = response.data
+          }
+          })
     },
-    // ----------------------------------方法--------------------
     // 返回
     handleReturn() {
+      this.temp = {
+       bankAccount:'',	 // 银行账号
+       bankName:'',	 // 开户行
+       company:'',	 // 所在单位
+       createBySid:'',	 // 用户sid
+       mobile:'',	 // 手机号
+       name:'',	 // 姓名
+       remarks:'',
+       sid:''
+      },
       this.$emit('doback')
     },
   }
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehugenjinjilu/genjinjiluguanli.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehugenjinjilu/genjinjiluguanli.vue
index 94b26c7966..fe8b9aeef1 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehugenjinjilu/genjinjiluguanli.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehugenjinjilu/genjinjiluguanli.vue
@@ -422,8 +422,7 @@ export default {
       })
     },
     doClose() {
-      this.$store.dispatch('tagsView/delView', this.$route);
-      this.$router.go(-1)
+      this.$emit('handleReturn')
     },
     // 添加保存完成
     dataCreated() {
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuziliao/kehudanganziliao.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuziliao/kehudanganziliao.vue
index e2a9bb1a5a..a3f71f63a9 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuziliao/kehudanganziliao.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuziliao/kehudanganziliao.vue
@@ -129,7 +129,7 @@ import Upload from '@/components/uploadFile/FileUpload' // 上传文件
 
 export default {
   name: 'KeHuDangAnZiLiao',
-  components: { pagerList, save, fetchFileListBySid, deleteFilesOss, Pagination, pageye, Upload },
+  components: { Pagination, pageye, Upload },
   data() {
     return {
       btndisabled: false,
diff --git a/anrui-scm/anrui-scm-ui/src/api/flow/tiaozhangshenqing.js b/anrui-scm/anrui-scm-ui/src/api/flow/tiaozhangshenqing.js
index 6d5f3bb0fa..15362ffe60 100644
--- a/anrui-scm/anrui-scm-ui/src/api/flow/tiaozhangshenqing.js
+++ b/anrui-scm/anrui-scm-ui/src/api/flow/tiaozhangshenqing.js
@@ -16,6 +16,13 @@ export default {
       data: params
     })
   },
+  agreeTaskOrgChange: function(params) {
+    return request({
+      url: '/base/v1/baseaccadjapply/InitiatorToAnswer',
+      method: 'post',
+      data: params
+    })
+  },
   // 流程审批（驳回）
   rejectTask: function(params) {
     return request({
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 190b799c4e..4d83897a6d 100644
--- a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
+++ b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
@@ -527,6 +527,21 @@ const codemenu = [
       meta: { title: '调账申请管理', noCache: true }
     }]
   },
+  // 车辆检查
+  {
+    path: '/yanchejianchaxiangmu',
+    component: Layout,
+    redirect: '/yanchejianchaxiangmu/yanchejiancha',
+    meta: {
+      title: '验车检查项目管理'
+    },
+    children: [{
+      path: '/yanchejianchaxiangmu/yanchejiancha',
+      component: () => import('@/views/supplychain/yanchejianchaxiangmu/yanchejiancha.vue'),
+      name: 'yanchejiancha',
+      meta: { title: '验车检查项目管理', noCache: true }
+    }]
+  },
 
   // 流程审批
   // 入账管理编辑
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue
index 4787de42b8..b32a4dd82e 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue
@@ -159,17 +159,17 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item prop="priced">
+            <el-form-item prop="costPrice">
               <span slot="label">厂家入库价：</span>
-              <el-input v-model="temp.priced" maxlength="125" placeholder="" class="addinputw" clearable/>
+              <el-input v-model="temp.costPrice" maxlength="125" placeholder="" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item prop="guidedPrice">
+            <el-form-item prop="salePrice">
               <span slot="label">成交价：</span>
-              <el-input v-model="temp.guidedPrice" maxlength="125" placeholder="" class="addinputw" clearable/>
+              <el-input v-model="temp.salePrice" maxlength="125" placeholder="" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -215,7 +215,7 @@
         <el-col :span="12">
           <el-form-item prop="">
             <span slot="label">内部编码：</span>
-            <el-input placeholder="" class="addinputw" v-model="temp.vehicleCode" clearable/>
+            <el-input placeholder="" class="addinputw" v-model="temp.insideCode" clearable/>
           </el-form-item>
         </el-col>
         <el-col :span="12" />
@@ -285,7 +285,8 @@ export default {
         createOrgName: '',//创建组织名称(陕汽必须的字段)
         departureDate: '',//	发车日期
         engineNo: '',//发动机号/许可证号（陕汽必须的字段）
-        guidedPrice: '',//	成交价
+        salePrice: '',//	成交价
+        costPrice: '', // 厂家入库价
         locationName: '',// 存放地点
         location: '',//存放地点（陕汽必须的字段）
         lockedState: '',//	锁定状态
@@ -310,7 +311,8 @@ export default {
         vehicleState: '',//	车辆状态key值
         vehicleStateValue: '',//	车辆状态value值
         vinNo: '',//车架号(VIN)（陕汽必须的字段）
-        warrantyCardNo: ''//保修卡号
+        warrantyCardNo: '',//保修卡号
+        insideCode: '' // 内部编码
       }, // 添加和修改
       useOrgArry: [],
       modelValue: [],
@@ -354,13 +356,12 @@ export default {
           message: '请选择常用配置',
           trigger: 'change'
         }],
-
-        priced: [{
+        costPrice: [{
           required: true,
           message: '请填写厂家入库价',
           trigger: 'blur'
         }],
-        guidedPrice: [{
+        salePrice: [{
           required: true,
           message: '请填写指导价',
           trigger: 'blur'
@@ -479,7 +480,6 @@ export default {
               console.log('级联选择2：', this.useOrgArry)
             }
             this.temp = response.data
-            this.getLocation()
             this.getModelConfig(this.temp.modelSid)
           }
         })
@@ -723,7 +723,8 @@ export default {
           createOrgName: '',//创建组织名称(陕汽必须的字段)
           departureDate: '',//	发车日期
           engineNo: '',//发动机号/许可证号（陕汽必须的字段）
-          guidedPrice: '',//	成交价
+          salePrice: '',//	成交价
+          costPrice: '', // 厂家入库价
           locationName: '',// 存放地点
           location: '',//存放地点（陕汽必须的字段）
           lockedState: '',//	锁定状态
@@ -748,7 +749,8 @@ export default {
           vehicleState: '',//	车辆状态key值
           vehicleStateValue: '',//	车辆状态value值
           vinNo: '',//车架号(VIN)（陕汽必须的字段）
-          warrantyCardNo: ''//保修卡号
+          warrantyCardNo: '',//保修卡号
+          insideCode: '' // 内部编码
         }
         this.useOrgArry = []
         this.$emit('doback')
@@ -781,15 +783,11 @@ export default {
                     duration: 2000
                   })
                   this.handleReturn('true')
-                } else {
-                  this.$notify({
-                    title: '提示',
-                    message: '添加失败',
-                    type: 'error',
-                    duration: 2000
-                  })
                 }
               })
+                .catch(e => {
+                  this.dialogFormVisible = false
+                })
             } else {
               Update(this.temp).then((response) => {
                 this.FormLoading = false
@@ -802,14 +800,11 @@ export default {
                     duration: 2000
                   })
                   this.handleReturn('true')
-                } else {
-                  this.$notify({
-                    title: '失败',
-                    message: '修改失败',
-                    type: 'error'
-                  })
                 }
               })
+                .catch(e => {
+                  this.dialogFormVisible = false
+                })
             }
           }
         })
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangInfo.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangInfo.vue
index 3a12df6c48..e3628363de 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangInfo.vue
@@ -7,77 +7,169 @@
       </div>
     </div>
     <div class="listconadd">
-      <el-form ref="dataForm" :model="temp" label-position="right" label-width="190px" class="forminfo">
+      <el-form ref="dataForm" :model="temp" label-position="right" class="forminfo">
         <div class="title">车辆台账信息</div>
         <el-row>
           <el-col :span="4" class="trightb">车型名称：</el-col>
-          <el-col :span="8"> {{ temp.modelName }}</el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <span>{{ temp.modelName }}</span>
+            </el-form-item>
+          </el-col>
           <el-col :span="4" class="trightb">常用配置：</el-col>
-          <el-col :span="8"> {{ temp.configName }}</el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <span>{{ temp.configName }}</span>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="4" class="trightb">库存状态：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.vehicleStateValue }}</el-col>
+          <el-col :span="8" class="tleft">
+            <el-form-item>
+              <span>{{ temp.vehicleStateValue }}</span>
+            </el-form-item>
+          </el-col>
           <el-col :span="4" class="trightb">车架号：</el-col>
-          <el-col :span="8"> {{ temp.vinNo }}</el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <span>{{ temp.vinNo }}</span>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="4" class="trightb">发动机号/许可证号：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.engineNo }}</el-col>
+          <el-col :span="8" class="tleft">
+            <el-form-item>
+              <span>{{ temp.engineNo }}</span>
+            </el-form-item>
+          </el-col>
           <el-col :span="4" class="trightb">厂家订单编码：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.orderingNo }}</el-col>
+          <el-col :span="8" class="tleft">
+            <el-form-item>
+              <span>{{ temp.orderingNo }}</span>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="4" class="trightb">厂家采购订单类型：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.manPurOrderTypeValue }}</el-col>
+          <el-col :span="8" class="tleft">
+            <el-form-item>
+              <span>{{ temp.manPurOrderTypeValue }}</span>
+            </el-form-item>
+          </el-col>
           <el-col :span="4" class="trightb">厂家入库日期：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.priceDate }}</el-col>
+          <el-col :span="8" class="tleft">
+            <el-form-item>
+              <span>{{ temp.priceDate }}</span>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="4" class="trightb">发车日期：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.departureDate }}</el-col>
+          <el-col :span="8" class="tleft">
+            <el-form-item>
+              <span>{{ temp.departureDate }}</span>
+            </el-form-item>
+          </el-col>
           <el-col :span="4" class="trightb">到货日期：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.arrivalDate }}</el-col>
+          <el-col :span="8" class="tleft">
+            <el-form-item>
+              <span>{{ temp.arrivalDate }}</span>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="4" class="trightb">销售日期：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.salesDate }}</el-col>
+          <el-col :span="8" class="tleft">
+            <el-form-item>
+              <span>{{ temp.salesDate }}</span>
+            </el-form-item>
+          </el-col>
           <el-col :span="4" class="trightb">买断日期：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.solidDate }}</el-col>
+          <el-col :span="8" class="tleft">
+            <el-form-item>
+              <span>{{ temp.solidDate }}</span>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="4" class="trightb">结算状态：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.settlementStatus }}</el-col>
+          <el-col :span="8" class="tleft">
+            <el-form-item>
+              <span>{{ temp.settlementStatus }}</span>
+            </el-form-item>
+          </el-col>
           <el-col :span="4" class="trightb">采购退库日期：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.returnDate }}</el-col>
+          <el-col :span="8" class="tleft">
+            <el-form-item>
+              <span>{{ temp.returnDate }}</span>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="4" class="trightb">存放地点：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.locationName }}</el-col>
+          <el-col :span="8" class="tleft">
+            <el-form-item>
+              <span>{{ temp.locationName }}</span>
+            </el-form-item>
+          </el-col>
           <el-col :span="4" class="trightb">厂家入库价：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.priced }}</el-col>
+          <el-col :span="8" class="tleft">
+            <el-form-item>
+              <span>{{ temp.costPriced }}</span>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="4" class="trightb">成交价：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.guidedPrice }}</el-col>
+          <el-col :span="8" class="tleft">
+            <el-form-item>
+              <span>{{ temp.salePrice }}</span>
+            </el-form-item>
+          </el-col>
           <el-col :span="4" class="trightb">保修卡号：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.warrantyCardNo }}</el-col>
+          <el-col :span="8" class="tleft">
+            <el-form-item>
+              <span>{{ temp.warrantyCardNo }}</span>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="4" class="trightb">锁定状态：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.lockedStateValue }}</el-col>
+          <el-col :span="8" class="tleft">
+            <el-form-item>
+              <span>{{ temp.lockedStateValue }}</span>
+            </el-form-item>
+          </el-col>
           <el-col :span="4" class="trightb">使用组织：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.useOrgName }}</el-col>
+          <el-col :span="8" class="tleft">
+            <el-form-item>
+              <span>{{ temp.useOrgName }}</span>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="4" class="trightb">创建组织：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.createOrgName }}</el-col>
+          <el-col :span="8" class="tleft">
+            <el-form-item>
+              <span>{{ temp.createOrgName }}</span>
+            </el-form-item>
+          </el-col>
           <el-col :span="4" class="trightb">特殊说明：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.specialInstructions }}</el-col>
+          <el-col :span="8" class="tleft">
+            <el-form-item>
+              <span>{{ temp.specialInstructions }}</span>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="4" class="trightb">内部编码：</el-col>
-          <el-col :span="8" class="tleft"> {{ temp.vehicleCode }}</el-col>
+          <el-col :span="8" class="tleft">
+            <el-form-item>
+              <span>{{ temp.insideCode }}</span>
+            </el-form-item>
+          </el-col>
           <el-col :span="12" class="trightb"/>
         </el-row>
       </el-form>
@@ -156,10 +248,19 @@ export default {
 <style scoped>
 /deep/ .lookimg .img{
   width: 100px;
-      margin: 10px;
+  margin: 10px;
 }
 .listconadd {
   width: 100%;
   padding: 0 48px !important;
 }
+/deep/ .el-form-item{
+  padding-top: 5px;
+  margin-bottom: 0;
+}
+/deep/ .el-form-item__content {
+  line-height: 37px;
+  position: relative;
+  font-size: 14px;
+}
 </style>
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/yanchejianchaxiangmu/yanchejiancha.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/yanchejianchaxiangmu/yanchejiancha.vue
new file mode 100644
index 0000000000..889939fd32
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/yanchejianchaxiangmu/yanchejiancha.vue
@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: 'yanchejiancha'
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/yanchejianchaxiangmu/yanchejianchaAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/yanchejianchaxiangmu/yanchejianchaAdd.vue
new file mode 100644
index 0000000000..26f5d72bf2
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/yanchejianchaxiangmu/yanchejianchaAdd.vue
@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: 'yanchejianchaAdd'
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/yanchejianchaxiangmu/yanchejianchaInfo.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/yanchejianchaxiangmu/yanchejianchaInfo.vue
new file mode 100644
index 0000000000..471ba0a37e
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/yanchejianchaxiangmu/yanchejianchaInfo.vue
@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: 'yanchejianchaInfo'
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqingOrgChange.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqingOrgChange.vue
new file mode 100644
index 0000000000..992f6d14b6
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqingOrgChange.vue
@@ -0,0 +1,397 @@
+<template>
+  <div class="app-container">
+    <div>
+      <!--标题按钮部分开始-->
+      <div class="tab-header webtop">
+        <!--标题-->
+        <div>分公司间调账申请详情</div>
+        <!--start 添加修改按钮-->
+        <div>
+          <el-button type="primary" @click="openAgree('同意')">同 意</el-button>
+          <el-button type="danger" @click="openReject('驳回')">驳 回</el-button>
+          <el-button type="danger" @click="openStop('终止')">终 止</el-button>
+        </div>
+        <!--end 添加修改按钮-->
+        <!--end 详情按钮-->
+      </div>
+      <!--标题按钮部分结束-->
+      <!--Start 新增修改部分-->
+      <div class=""><!-- -->
+        <div class="title">分公司间调账申请</div> <!--:rules="rules"-->
+        <el-form ref="dataForm" :model="temp" :rules="rules" :inline="true" label-width="120px">
+          <div class="invoiceadd" style="margin-top: 5px;">
+            <el-row>
+              <el-col :span="8">
+                <el-form-item prop="accadjTypeValue" label="调账类型">
+                  <span>{{temp.accadjTypeValue}}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8"><!-- :readonly="depositVehicleList[scope.$index].inboundDate" -->
+                <el-form-item prop="callOutOrgName" label="调出分公司">
+                  <span>{{temp.callOutOrgName}}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item prop="callInOrgName" label="调入分公司">
+                  <span>{{temp.callInOrgName}}</span>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+          <div class="addtable">
+            <div class="tabletitle">
+              <div class="titlename">
+                申请车辆列表
+              </div>
+            </div>
+            <template class="tablelist">
+              <el-table :data="list" border style="width: 100%" :index="index">
+                <el-table-column align="center" fixed label="序号" type="index" width="50"/>
+                <el-table-column label="车型名称" align="center" width="190px">
+                  <template slot-scope="scope">
+                    <span>{{ scope.row.vehicleAlias }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="常用配置" align="center" width="360">
+                  <template slot-scope="scope">
+                    <span>{{ scope.row.configName }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="车架号" align="center" width="120">
+                  <template slot-scope="scope" @click="">
+                    <span>{{ scope.row.vinNo }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="库存地点" align="center" width="200">
+                  <template slot-scope="scope" @click="">
+                    <span>{{ scope.row.inventoryLocationName }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="内销价格" align="center" width="90">
+                  <template slot-scope="scope">
+                    <span>{{ scope.row.witPinMoney }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="发票类型" align="center" width="140">
+                  <template slot-scope="scope">
+                    <span>{{ scope.row.invoiceTypeValue }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="运费" align="center" width="90">
+                  <template slot-scope="scope">
+                    <span>{{ scope.row.freight }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="运费承担方" align="center" width="120">
+                  <template slot-scope="scope">
+                    <span>{{ scope.row.freightUndertakerName }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="备注" align="left" header-align="center" width="300">
+                  <template slot-scope="scope">
+                    <span>{{ scope.row.remarks }}</span>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </template>
+          </div>
+        </el-form>
+      </div>
+      <!--End 添加修改部分-->
+    </div>
+    <!-- 选择待办人 的弹出框-->
+    <el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
+      <el-form label-position="right" class="formadd">
+        <el-row v-show="currentLink">
+          <el-col :span="4" class="tleftb">当前环节</el-col>
+          <el-col :span="20" class="trightb">
+            <el-form-item prop="purchasingUnitName"><span>{{ current.taskName }}->{{ nextNode.name }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row style="border-bottom: 1px solid #e0e3eb;">
+          <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="confirm">确 定</el-button>
+          <el-button type="info " size="mini" @click="nodeDialogVisible = false">取 消</el-button>
+        </div>
+      </el-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { fetchDetailsBySid } from '@/api/supplychain/tiaozhangshenqing.js'
+import req from '@/api/flow/tiaozhangshenqing'
+
+export default {
+  name: 'tiaozhangshenqing',
+  data() {
+    return {
+      isXuanche: false,
+      viewTitle: '',
+      dialogStatus: '',
+      index: 0,
+      list: [],
+      depositVehicleList: [],
+      accadjTypeValue_list: [],
+      // 表单数据
+      temp: {
+        sid:'',
+        applyDate:'',  // 申请日期
+        accadjTypeKey:'',  // 调账类型key
+        accadjTypeValue:'',  // 调账类型value
+        callOutOrgSid:'',  // 调出分公司sid
+        callOutOrgName:'',  // 调出分公司名称
+        callInOrgSid:'',  // 调入分公司sid
+        callInOrgName:'',  // 调入分公司名称
+        baseInternalPurchaseVehicles:[],  // 调账车辆列表
+      },
+      rules: {
+      },
+      submitdisabled: false, // 保存按钮
+      disabled: false ,// 提交按钮
+      // ------流程所需------------------------------
+      currentLink:true, // 控制当前环节一行的显示隐藏
+      dialogList: {
+        comment: ''
+      },
+      xmlData: '', // 模型xml数据
+      taskList: [],
+      startTask: true,
+      current: {
+        taskDefKey: '',
+        taskName: '' // 当前环节名称
+      },
+      nextNode: {}, // 下一环节
+      nodeDialogVisible: false,
+      // 同意办理列表
+      agreeList: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        orgSidPath: '',
+        taskDefKey: '',
+        userSid:''
+      },
+      // 驳回列表
+      regectList: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        userSid: ''
+      },
+      // 终止列表
+      stopList: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        userSid: ''
+      }
+    }
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: document.body.scrollHeight + 120 + 'px'
+      }
+    }, '*')
+  },
+  created() {
+    // ===获取参数
+    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.agreeList.businessSid = obj.businessSid
+    this.agreeList.instanceId = obj.instanceId
+    this.agreeList.taskId = obj.taskId
+    this.agreeList.taskDefKey = obj.taskDefKey
+    this.agreeList.userSid =  window.sessionStorage.getItem('userSid')
+    this.agreeList.orgSidPath = window.sessionStorage.getItem('orgSidPath')
+    this.current.taskDefKey = obj.taskDefKey
+    this.current.taskName = obj.taskName
+    // 驳回列表
+    this.regectList.businessSid = obj.businessSid
+    this.regectList.instanceId = obj.instanceId
+    this.regectList.taskId = obj.taskId
+    this.regectList.userSid = window.sessionStorage.getItem('userSid')
+    // 终止列表
+    this.stopList.businessSid = obj.businessSid
+    this.stopList.instanceId = obj.instanceId
+    this.stopList.taskId = obj.taskId
+    this.stopList.userSid = window.sessionStorage.getItem('userSid')
+    // 办理状态
+    this.transactState = obj.transactState
+    // 加载流程图相关的数据
+    this.showInfo(obj.businessSid)
+    this.getModelDetail(obj.deployId)
+    this.getFlowViewer(obj.instanceId)
+  },
+  methods: {
+    showInfo(sid) {
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      fetchDetailsBySid(sid).then(resp => {
+        if (resp.success) {
+          const data = resp.data
+          this.temp = data
+          this.list = data.baseInternalPurchaseVehicles
+          console.log('编辑初始化', this.temp)
+        }
+      }).catch(e => {
+        this.submitdisabled = false
+      })
+    },
+    // ---------- 流程开始 ------------------------------
+    /** xml 文件 */
+    getModelDetail(deployId) {
+      // 发送请求，获取xml
+      req.readXml(deployId).then((res) => {
+        this.xmlData = res.data
+      })
+    },
+    // 已办环节的节点
+    getFlowViewer(procInsId) {
+      req.getFlowViewer(procInsId).then((res) => {
+        this.taskList = res.data
+      })
+    },
+    // 点击同意
+    openAgree(val) {
+      this.operation = val
+      this.currentLink = true // 控制当前环节一行的显示隐藏
+      // const formVariables = {
+      //   businessSid: this.agreeList.businessSid
+      // }
+      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 // 控制当前环节一行的显示隐藏
+      // const formVariables = {
+      //   businessSid: this.regectList.businessSid
+      // }
+      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.nodeDialogVisible = true
+    },
+    /** 选择代办人确认 */
+    confirm() {
+      if (this.operation === '同意') {
+        this.handleAgree()
+      } else if (this.operation === '驳回') {
+        this.handleReject()
+      } else if (this.operation === '终止') {
+        this.handleStop()
+      }
+    },
+    /** 同意任务 */
+    handleAgree() {
+      this.agreeList.comment = this.dialogList.comment
+      req.agreeTaskOrgChange(this.agreeList).then((response) => {
+        if (response.success) {
+          this.$message({
+            showClose: true,
+            message: '执行成功',
+            type: 'success'
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    /** 驳回任务 */
+    handleReject() {
+      this.regectList.comment = this.dialogList.comment
+      req.rejectTask(this.regectList).then((response) => {
+        if (response.success) {
+          this.$message({
+            showClose: true,
+            message: '执行成功',
+            type: 'success'
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    /** 终止任务 */
+    handleStop() {
+      this.stopList.comment = this.dialogList.comment
+      req.breakTask(this.stopList).then((response) => {
+        if (response.success) {
+          this.$message({
+            showClose: true,
+            message: '执行成功',
+            type: 'success'
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+
+  }
+}
+</script>
+
+<style scoped>
+.title {
+  padding: 28px 0;
+  text-align: center;
+}
+</style>