From f1e2e06b105baf27bd58b0287e3b3969db69c2b6 Mon Sep 17 00:00:00 2001
From: Zhao Qiqi <1287235164@qq.com>
Date: Thu, 11 Aug 2022 19:23:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E9=87=87=E7=9A=84=E5=86=85=E9=83=A8?=
 =?UTF-8?q?=E7=BC=96=E7=A0=81,=E5=90=88=E6=A0=BC=E8=AF=81=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E4=B8=AD=E5=90=88=E6=A0=BC=E8=AF=81=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?,=E5=90=88=E6=A0=BC=E8=AF=81=E7=9B=98=E7=82=B9=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/router/modules/codemenu.js            |  15 +
 .../baseoutsourcingapplicationAdd.vue         |   4 +-
 .../chexingbyconfiguration.vue                |   3 +-
 .../hegezhengtaizhang/hegezhengtaizhang.vue   | 191 +++++----
 .../hegezhengtaizhangAdd.vue                  |  34 +-
 .../hegezhengpandianjilu.vue                  | 382 ++++++++++++++++++
 .../hegezhengpandianjiluAdd.vue               | 299 ++++++++++++++
 7 files changed, 822 insertions(+), 106 deletions(-)
 create mode 100644 anrui-scm/anrui-scm-ui/src/views/supplychain/hegezhengpandianjilu/hegezhengpandianjilu.vue
 create mode 100644 anrui-scm/anrui-scm-ui/src/views/supplychain/hegezhengpandianjilu/hegezhengpandianjiluAdd.vue

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 e86f64a80a..1b72147d52 100644
--- a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
+++ b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
@@ -496,6 +496,21 @@ const codemenu = [
       meta: { title: '出库管理', noCache: true }
     }]
   },
+  // 合格证盘点记录
+  {
+    path: '/hegezhengpandian',
+    component: Layout,
+    redirect: '/hegezhengpandian',
+    meta: {
+      title: '合格证盘点'
+    },
+    children: [{
+      path: '/hegezhengpandian/pandianjilu',
+      component: () => import('@/views/supplychain/hegezhengpandianjilu/hegezhengpandianjilu.vue'),
+      name: 'hegezhengpandianjilu',
+      meta: { title: '合格证盘点', noCache: true }
+    }]
+  },
   // 验车管理
   // {
   //   path: '/yancheguanli',
diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue
index 6ab41c782c..97dc1b768e 100644
--- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue
@@ -109,8 +109,7 @@
             </el-col>
             <el-col :span="4" class="trightb">
               <el-form-item prop="">
-                <el-input size="small" v-model="formobj.insideCode" placeholder="内部编码" class="addinputw"
-                          clearable/>
+                <span>{{formobj.insideCode}}</span>
               </el-form-item>
             </el-col>
           </el-row>
@@ -486,6 +485,7 @@ export default {
       this.formobj.configName = info[0].configName // 常用配置名称
       this.formobj.configSid = info[0].configSid // 常用配置sid
       this.formobj.guidedPrice = info[0].guidedPrice// 销售指导价
+      this.formobj.insideCode = info[0].insideCode// 内部编码
       this.formobj.manufactorSettlementPrice = info[0].manufactorSettlementPrice// 厂家合同价
     },
     selectVehicleDialog() {
diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/chexingbyconfiguration.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/chexingbyconfiguration.vue
index df15ae503b..c8571fd942 100644
--- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/chexingbyconfiguration.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/chexingbyconfiguration.vue
@@ -161,7 +161,8 @@ export default {
           configName: element.configName,
           configSid: element.configSid,
           guidedPrice: element.guidedPrice,
-          manufactorSettlementPrice: element.manufactorSettlementPrice
+          manufactorSettlementPrice: element.manufactorSettlementPrice,
+          insideCode:element.insideCode
         })
       })
       this.sids = aa
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhang.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhang.vue
index 16340b0629..1f0f18b44c 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhang.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhang.vue
@@ -48,7 +48,7 @@
               </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
-              <el-button type="primary" icon="el-icon-search" size="small"  @click="handleFilter">查询</el-button>
+              <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
               <el-button type="primary" icon="el-icon-refresh" size="small" @click="handleReset">重置</el-button>
             </div>
           </div>
@@ -63,12 +63,12 @@
                     @selection-change="handleSelectionChange">
             <el-table-column width="50px" type="selection" align="center"/>
             <el-table-column width="80px" fixed label="序号" type="index" :index="indexMethod" align="center"/>
-<!--            <el-table-column label="操作" fixed align="center" width="220px" class-name="small-padding fixed-width">-->
-<!--              <template slot-scope="{row}">-->
-<!--                <el-button size="mini" type="primary" @click="handleCheck(row)">查看</el-button>-->
-<!--                <el-button size="mini" type="primary" @click="cheLiangXiangXi(row)">车辆信息</el-button>-->
-<!--              </template>-->
-<!--            </el-table-column>-->
+            <!--            <el-table-column label="操作" fixed align="center" width="220px" class-name="small-padding fixed-width">-->
+            <!--              <template slot-scope="{row}">-->
+            <!--                <el-button size="mini" type="primary" @click="handleCheck(row)">查看</el-button>-->
+            <!--                <el-button size="mini" type="primary" @click="cheLiangXiangXi(row)">车辆信息</el-button>-->
+            <!--              </template>-->
+            <!--            </el-table-column>-->
             <el-table-column label="车架号" width="180px" align="center">
               <template slot-scope="scope">
                 <span class="bluezi" @click="cheLiangXiangXi(scope.row)">{{ scope.row.vinNo }}</span>
@@ -158,6 +158,7 @@ import hegezhengtaizhangAdd from './hegezhengtaizhangAdd'
 import hegezhengInfo from './hegezhengInfo'
 import cheliangtaizhangInfo from '@/views/cheliang/cheliangtaizhang/cheliangtaizhangInfo'
 import ButtonBar from '@/components/ButtonBar'
+import { getPathSidByUserSid } from '@/api/cheliang/basevehiclemodel'
 
 export default {
   name: 'hegezhengtaizhang',
@@ -269,14 +270,16 @@ export default {
       total: 1,
       FormLoading: false,
       listLoading: false,
+      useOrg:'',
       listQuery: {
         params: {
           certificateStartDate: '',
           certificateEndDate: '',
           certificateState: '',
           certificationNo: '',
-          vinNo:'',
-          transferStateKey:''
+          vinNo: '',
+          createOrgSid:'',
+          transferStateKey: ''
         },
         current: 1,
         size: 20
@@ -293,26 +296,26 @@ export default {
       dialogFormVisible: false, // 添加修改对话框状态
       dialogFormShowVisible: false, // 查看对话框默认关闭状态
       dialogStatus: '', // 对话框状态
-        typeOptions: [],
+      typeOptions: [],
 
-        rules: {
-          title: [
-            {
-              required: true,
-              message: '请填写',
-              trigger: 'blur'
-            }
-          ],
-          qc: [
-            {
-              required: true,
-              message: '请填写',
-              trigger: 'blur'
-            }
-          ]
-        }
-        // ------------------------------------
+      rules: {
+        title: [
+          {
+            required: true,
+            message: '请填写',
+            trigger: 'blur'
+          }
+        ],
+        qc: [
+          {
+            required: true,
+            message: '请填写',
+            trigger: 'blur'
+          }
+        ]
       }
+      // ------------------------------------
+    }
   },
   computed: {
     ...mapGetters([
@@ -327,7 +330,7 @@ export default {
     // 初始化变量
     this.init()
     // 加载列表
-    this.getList()
+    this.getPathSid()
   },
   mounted() {
     this.$refs['btnbar'].setButtonList(this.btnList)
@@ -404,25 +407,35 @@ export default {
         }
       })
     },
+    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.getList()
+        }
+      })
+    },
     // 查询列表信息
-      getList() {
-        this.listLoading = true
-        pagerList(this.listQuery).then((response) => {
-          console.log('列表查询结果：', response)
-          this.listLoading = false
-          if (
-            response.code === '200' &&
-            response.data &&
-            response.data.total > 0
-          ) {
-            this.list = response.data.records
-            this.total = response.data.total
-          } else {
-            this.list = []
-            this.total = 0
-          }
-        })
-      },
+    getList() {
+      this.listLoading = true
+      pagerList(this.listQuery).then((response) => {
+        console.log('列表查询结果：', response)
+        this.listLoading = false
+        if (
+          response.code === '200' &&
+          response.data &&
+          response.data.total > 0
+        ) {
+          this.list = response.data.records
+          this.total = response.data.total
+        } else {
+          this.list = []
+          this.total = 0
+        }
+      })
+    },
     // 查询按钮
     handleFilter() {
       this.listQuery.current = 1
@@ -436,13 +449,13 @@ export default {
           certificateEndDate: '',
           certificateState: '',
           certificationNo: '',
-          vinNo:'',
-          transferStateKey:''
+          vinNo: '',
+          transferStateKey: ''
         },
         current: 1,
         size: 20
       }
-      this.getList()
+      this.getPathSid()
     },
     // ----------------------------------方法--------------------
     // 添加前数据初始化
@@ -467,7 +480,7 @@ export default {
     toAdd() {
       this.viewState = 2
       // this.dialogStatus = 'add'
-      this.$refs['divadd'].showAdd()
+      this.$refs['divadd'].showAdd(this.useOrg)
       // this.$router.push({
       //   path: '/cheliang/hegezhengtaizhangAdd/0'
       // })
@@ -492,7 +505,7 @@ export default {
         this.viewState = 3
         const sid = this.sids[0]
         const row = this.row
-        this.$refs['divadd'].showEdit(sid, row)
+        this.$refs['divadd'].showEdit(sid, row,this.useOrg)
       } else if (this.sids.length > 1) {
         this.$notify({
           title: '提示',
@@ -504,25 +517,25 @@ export default {
         this.$notify({
           title: '提示',
           message: '没有选择合格证台账!!',
-            type: 'error',
-            duration: 2000
-          })
-          return
-        }
-      },
-      // 打开查看
-      handleCheck(row) {
-        console.log('222222', row)
-        this.viewState = 4
-        const sid = row.sid
-        this.$refs['divinfo'].showInfo(sid)
-        // this.$router.push({
-        //   path: '/cheliang/hegezhengInfo',
-        //   query: {
-        //     sid: row.sid
-        //   }
-        // })
-      },
+          type: 'error',
+          duration: 2000
+        })
+        return
+      }
+    },
+    // 打开查看
+    handleCheck(row) {
+      console.log('222222', row)
+      this.viewState = 4
+      const sid = row.sid
+      this.$refs['divinfo'].showInfo(sid)
+      // this.$router.push({
+      //   path: '/cheliang/hegezhengInfo',
+      //   query: {
+      //     sid: row.sid
+      //   }
+      // })
+    },
     // 根据本行ID删除数据
     doDel() {
       const _this = this
@@ -578,8 +591,8 @@ export default {
         })
       })
     },
-    doClose(){
-      this.$store.dispatch('tagsView/delView', this.$route);
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route)
       this.$router.go(-1)
     },
     handleLock(row) {
@@ -588,28 +601,28 @@ export default {
       console.log(this.imgs, 'wowoeieiurir')
       this.dialogFormVisible = true
       this.dialogTitle = '查看'
-        // this.$refs.editform.initForm(row)
-      }
-
+      // this.$refs.editform.initForm(row)
     }
+
   }
+}
 </script>
 <style scoped>
-  /deep/ .el-collapse {
-    border-top: 0px solid #e6ebf5;
-    border-bottom: 0px solid #e6ebf5;
-  }
+/deep/ .el-collapse {
+  border-top: 0px solid #e6ebf5;
+  border-bottom: 0px solid #e6ebf5;
+}
 
-  /deep/ .el-collapse-item__content {
-    margin: 0;
-    padding: 0;
-  }
+/deep/ .el-collapse-item__content {
+  margin: 0;
+  padding: 0;
+}
 
-  /deep/ .el-collapse-item__wrap {
-    border-bottom: 0px solid #ebeef5;
-  }
+/deep/ .el-collapse-item__wrap {
+  border-bottom: 0px solid #ebeef5;
+}
 
-  /deep/ .el-collapse-item__header {
-    border-bottom: 0px solid #e6ebf5;
-  }
+/deep/ .el-collapse-item__header {
+  border-bottom: 0px solid #e6ebf5;
+}
 </style>
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhangAdd.vue
index b7da597ff8..d1a927ac37 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhangAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhangAdd.vue
@@ -32,12 +32,13 @@
           <el-col :span="12">
             <el-form-item prop="certificateStateValue">
               <span slot="label">合格证状态：</span>
-              <el-input v-model="temp.certificateStateValue" placeholder="请输入内容" :disabled="true" class="addinputw">
-              </el-input>
-<!--              <el-select v-model="temp.certificateState" class="addinputw" placeholder="请选择合格证状态"-->
-<!--                         @change="getHeGeZheng">-->
-<!--                <el-option v-for="item in Situation" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>-->
-<!--              </el-select>-->
+              <!--              <el-input v-model="temp.certificateStateValue" placeholder="请输入内容" :disabled="true" class="addinputw">-->
+              <!--              </el-input>-->
+              <el-select v-model="temp.certificateState" :disabled="dialogStatus == 'add'" class="addinputw"
+                         placeholder="请选择合格证状态"
+                         @change="getHeGeZheng">
+                <el-option v-for="item in Situation" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              </el-select>
             </el-form-item>
           </el-col>
 
@@ -357,12 +358,13 @@ export default {
       FormLoading: false,
       listLoading: false,
       temp: {
+        createOrgSid: '',
         certificateSituation: '',
         certificateSituationValue: '',
         certificatePhoto: [],
-        certificateState: '0002', // 合格证状态key
+        certificateState: '004', // 合格证状态key
         certificateStateValue: '正式', // 合格证状态value
-        noticeModel:'' // 公告型号
+        noticeModel: '' // 公告型号
       }, // 添加和修改
       templook: {}, // 查看实体
       Situation: [],
@@ -393,9 +395,9 @@ export default {
         certificateDate: [
           { required: true, message: '请选择发证日期', trigger: 'blur' }
         ],
-        // certificateSituation: [
-        //   { required: true, message: '请选择合格证情况', trigger: 'change' }
-        // ],
+        certificateSituation: [
+          { required: true, message: '请选择合格证情况', trigger: 'change' }
+        ],
         toCardDate: [
           { required: true, message: '请选择到证日期', trigger: 'blur' }
         ],
@@ -404,7 +406,7 @@ export default {
         ],
         certificateStateValue: [
           { required: true, message: '请选择合格证状态', trigger: 'change' }
-        ],
+        ]
         // certificatePhoto: [
         //   { required: true, message: '请选择合格证照片', trigger: 'blur' },
           // ],
@@ -450,15 +452,18 @@ export default {
         // this.getCheXingHao()
         this.getCheJia()
       },
-      showAdd() {
+      showAdd(createOrgSid) {
         this.$nextTick(() => {
           this.$refs['dataForm'].clearValidate()
         })
         this.dialogStatus = 'add'
         this.viewTitle = '【新增】合格证信息'
+        this.temp.certificateState = '004'
+        this.temp.certificateStateValue = '正式'
+        this.temp.createOrgSid = createOrgSid
       },
 
-      showEdit(sid, row) {
+      showEdit(sid, row, createOrgSid) {
         this.$nextTick(() => {
           this.$refs['dataForm'].clearValidate()
         })
@@ -468,6 +473,7 @@ export default {
           const data = resp.data
           this.temp = data
           this.temp.sid = sid
+          this.temp.createOrgSid = createOrgSid
         }).catch(e => {
           this.temp = row
         })
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/hegezhengpandianjilu/hegezhengpandianjilu.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/hegezhengpandianjilu/hegezhengpandianjilu.vue
new file mode 100644
index 0000000000..2236c7c668
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/hegezhengpandianjilu/hegezhengpandianjilu.vue
@@ -0,0 +1,382 @@
+<template>
+  <div class="app-container">
+    <!--查询和其列表部分-->
+    <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="isSearchShow = !isSearchShow">
+            {{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}
+          </el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form :inline="true" class="tab-header">
+              <el-form-item label="最新盘库日期">
+                <el-date-picker v-model="listQuery.params.inspectedStartDate" class="filter-item" type="date"
+                                format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="请选择"/>
+                <label>至</label>
+                <el-date-picker v-model="listQuery.params.inspectedEndDate" class="filter-item" type="date"
+                                format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="请选择"/>
+              </el-form-item>
+              <el-form-item label="车架号">
+                <el-input v-model="listQuery.params.vin" placeholder="请输入车架号" clearable/>
+              </el-form-item>
+              <el-form-item label="合格证编号">
+                <el-input v-model="listQuery.params.vin" placeholder="请输入合格证编号" clearable/>
+              </el-form-item>
+              <el-form-item label="存放地点">
+                <el-select v-model="listQuery.params.location" class="addinputw" clearable placeholder="请选择">
+                  <el-option v-for="(item,index) in location_list" :key="item.sid" :label="item.warehouseName"
+                             :value="item.sid"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="状态">
+                <el-select v-model="listQuery.params.InventoryState" class="addinputw" placeholder="请选择" clearable>
+                  <el-option v-for="item in stateType_list" :key="item.dictKey" :label="item.dictValue"
+                             :value="item.dictValue" />
+                </el-select>
+              </el-form-item>
+            </el-form>
+            <div class="btn">
+              <el-button type="primary" icon="el-icon-search" size="small" @click="getList">查询</el-button>
+              <el-button type="primary" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <!--Start 项目列表头部-->
+        <div class="listtop">
+          <div class="tit">合格证盘点记录列表</div>
+          <pageye v-show="dataList.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
+                  :limit.sync="listQuery.size" class="pagination" @pagination="loadList"/>
+        </div>
+        <!--End 项目列表头部-->
+        <!--Start 项目列表-->
+        <div class=""> <!--@selection-change="handleSelectionChange"-->
+          <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
+            <!--            <el-table-column width="50px" type="selection" align="center"/>-->
+            <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column label="操作" align="center" width="130px" class-name="small-padding fixed-width">
+              <template slot-scope="{row}">
+                <!-- :disabled="row.state == '待提交' ? false:row.state == '移库申请'?false : true" -->
+                <el-button size="mini" type="primary"
+                           @click="handleEdit(row)">办理
+                </el-button>
+              </template>
+            </el-table-column>
+            <el-table-column width="200px" prop="vin" label="合格证编号" align="center"/>
+            <el-table-column width="200px" prop="vin" label="车架号" align="center"/>
+            <el-table-column prop="model" label="最新盘库日期" align="center"/>
+            <el-table-column width="160px" prop="purchaseType" label="最新存放地点" align="center"/>
+            <el-table-column width="140px" prop="dispatchedDate" label="最新盘库人员" align="center"/>
+            <el-table-column width="140px" prop="inspectedDate" label="状态" align="center"/>
+            <el-table-column width="140px" prop="inspectedName" label="备注" align="center"/>
+          </el-table>
+        </div>
+        <!--End 项目列表-->
+        <div class="pages">
+          <div class="tit"/>
+          <!-- 翻页 -->
+          <pagination
+            v-show="dataList.length > 0"
+            :total="listQuery.total"
+            :page.sync="listQuery.current"
+            :limit.sync="listQuery.size"
+            class="pagination"
+            @pagination="loadList"
+          />
+        </div>
+      </div>
+    </div>
+    <!--办理-->
+    <el-dialog center :visible.sync="dialogVisible" width="70%">
+      <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+        <el-row style="border-top: 1px solid #E0E3EB">
+          <el-col :span="12">
+            <div class="span-sty spanOneWidth"><span>合格证编码</span></div>
+            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.mainSid }}</span></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty spanOneWidth"><span>车架号</span></div>
+            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.mainSid }}</span></el-form-item>
+          </el-col>
+          <!--          <el-col :span="12">-->
+          <!--            <div class="span-sty spanOneWidth"><span>合格证</span></div>-->
+          <!--            <el-form-item>-->
+          <!--              <el-select v-model="formobj.certificate" class="addinputw addinputwOne" placeholder="请选择" style="width: 30%" @change="changeCertificateType(scope.row,this)" clearable>-->
+          <!--                <el-option v-for="item in certificateType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>-->
+          <!--              </el-select>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="span-sty spanOneWidth"><span>盘库日期</span></div>
+            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.InventoryDate }}</span></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty spanOneWidth"><span>存放地点</span></div>
+            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.location }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="span-sty spanOneWidth"><span>盘库人员</span></div>
+            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.inventoryName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty spanOneWidth"><span>状态</span></div>
+            <el-form-item>
+              <el-select v-model="formobj.InventoryState" class="addinputw addinputwOne" placeholder="请选择"
+                         style="width: 30%" @change="changeStateType(scope.row,this)" clearable>
+                <el-option v-for="item in stateType_list" :key="item.dictKey" :label="item.dictValue"
+                           :value="item.dictValue"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty spanOneWidth"><span>备注</span></div>
+            <el-form-item>
+              <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputwOne"
+                        style="width: 80% !important; " clearable/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="handleQueDing">确 定</el-button>
+        <el-button @click="dialogVisible = false">取 消</el-button>
+      </span>
+    </el-dialog>
+    <!--新增修改部分组件-->
+    <hegezhengpandianjilu-add v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState"
+                              @reloadlist="getList"/>
+    <!--详情部分组件-->
+
+
+  </div>
+</template>
+
+<script>
+import { selectCarInspectedList, typeValues } from '@/api/supplychain/yancheguanli'
+import { getPathSidByUserSid } from '@/api/cheliang/basevehiclemodel'
+import { fetchByUseOrgSid } from '@/api/cheliang/dictcommons'
+import ButtonBar from '@/components/ButtonBar'
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import hegezhengpandianjiluAdd from '@/views/supplychain/hegezhengpandianjilu/hegezhengpandianjiluAdd'
+
+export default {
+  name: 'hegezhengpandianjilu',
+  components: {
+    ButtonBar,
+    Pagination,
+    pageye,
+    hegezhengpandianjiluAdd
+  },
+  data() {
+    return {
+      btndisabled: false,
+      viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+      isSearchShow: false,
+      tableLoading: false,
+      dialogVisible: false,
+      formobj: {},
+      stateType_list: [
+        {
+          dictKey: 1,
+          dictValue: '通过'
+        },
+        {
+          dictKey: 2,
+          dictValue: '不通过'
+        }
+      ],
+      dataList: [],
+      useOrg_list: [],
+      purchaseType_list: [],
+      location_list: [],
+      useOrg: '', // 使用组织
+      listQuery: {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          vin: '',
+          model: '',
+          purchaseType: '',
+          inspectedStartDate: '',
+          inspectedEndDate: '',
+          userSid: window.sessionStorage.getItem('userSid')
+        }
+      },
+      btnList: [
+        {
+          type: 'primary',
+          size: 'small',
+          icon: '',
+          btnKey: 'generatedRecords',
+          btnLabel: '生成盘点记录'
+        },
+        {
+          type: 'primary',
+          size: 'small',
+          icon: '',
+          btnKey: 'doCheck',
+          btnLabel: '盘点'
+        },
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
+      multipleSelection: []
+    }
+  },
+  created() {
+    this.getType()
+    this.getPathSid()
+  },
+  mounted() {
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  methods: {
+    resetState() {
+      this.viewState = 1
+    },
+    getType() {
+      typeValues({
+        type: 'purchaseOrderType '
+      }).then((response) => {
+        if (response.code === '200' && response.data) {
+          // this.purchaseType_list = response.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.getList()
+          this.getLocation(res.data)
+        }
+      })
+    },
+    // 根据组织获得存放地点
+    getLocation(useOrg) {
+      // 存放地点
+      fetchByUseOrgSid({
+        sid: useOrg
+      }).then((res) => {
+        if (res.code === '200') {
+          this.location_list = res.data
+          console.log('存放地点', this.location_list)
+        }
+      })
+    },
+    btnHandle(btnKey) {
+      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+      switch (btnKey) {
+        case 'generatedRecords':
+          this.generatedRecords()
+          break
+        case 'doCheck':
+          this.doCheck()
+          break
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
+    generatedRecords() {
+
+    },
+    doCheck() {
+      this.viewState = 2
+      this.$refs['divadd'].showAdd(this.useOrg)
+    },
+    handleEdit(row) {
+      this.formobj = row
+      this.dialogVisible = true
+    },
+    getList() {
+      this.listQuery.current = 1
+      this.loadList()
+    },
+    resetQuery() {
+      this.listQuery = {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          vin: '',
+          model: '',
+          purchaseType: '',
+          inspectedStartDate: '',
+          inspectedEndDate: '',
+          userSid: window.sessionStorage.getItem('userSid')
+        }
+      }
+      this.getPathSid()
+    },
+    loadList() {
+      const _this = this
+      this.tableLoading = true
+      selectCarInspectedList(this.listQuery)
+        .then(resp => {
+          _this.tableLoading = false
+          const data = resp.data
+          _this.listQuery.total = data.total
+          _this.dataList = data.records
+          for (var i = 0; i < this.dataList.length; i++) {
+            if (this.dataList[i].inspectedType == '1') {
+              this.dataList[i].inspectedType = '待验车'
+            } else {
+              this.dataList[i].inspectedType = '已验车'
+            }
+          }
+        })
+        .catch(() => {
+          _this.tableLoading = false
+        })
+    },
+    // 办理确定
+    handleQueDing() {
+      updateState(this.formobj).then((res) => {
+        this.dialogVisible = false
+        if (res.success) {
+          this.$message({ showClose: true, type: 'success', message: res.msg })
+          this.getList()
+        }
+      })
+    },
+    // 序号
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route)
+      this.$router.go(-1)
+    }
+  }
+}
+</script>
+
+<style scoped>
+.spanOneWidth {
+  width: 110px !important;
+}
+
+.addinputwOne {
+  margin-left: 110px !important;
+}
+</style>
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/hegezhengpandianjilu/hegezhengpandianjiluAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/hegezhengpandianjilu/hegezhengpandianjiluAdd.vue
new file mode 100644
index 0000000000..6cf3e294ec
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/hegezhengpandianjilu/hegezhengpandianjiluAdd.vue
@@ -0,0 +1,299 @@
+<template>
+  <div class="app-container">
+    <div>
+      <!--标题按钮部分开始-->
+      <div class="tab-header webtop">
+        <!--标题-->
+        <div>合格证盘点操作</div>
+        <!--start 添加修改按钮-->
+        <div>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <!--标题按钮部分结束-->
+      <!--Start 新增修改部分-->
+      <div class="listconadd">
+        <div class="titwu"><span>合格证盘点操作</span></div>
+        <el-form ref="form_obj" :model="listQuery" :rules="rules" class="formadd">
+          <div class="spe_style">
+            <el-form-item label="盘点人员">
+              <el-select v-model="listQuery.params.inventoryName" placeholder="请选择" filterable
+                         @change="changeInventoryName" clearable class="addinputwOne">
+                <el-option v-for="item in staff_list" :key="item.sid" :label="item.namePath"
+                           :value="item.sid"></el-option>
+              </el-select>
+            </el-form-item>
+          </div>
+          <el-form :inline="true" class="tab-header">
+            <el-form-item label="车架号">
+              <el-input v-model="listQuery.params.vin" placeholder="请输入车架号" clearable/>
+            </el-form-item>
+            <el-form-item label="合格证编号">
+              <el-input v-model="listQuery.params.vin" placeholder="请输入合格证编号" clearable/>
+            </el-form-item>
+          </el-form>
+          <div class="btn">
+            <el-button type="primary" icon="el-icon-search" size="small" @click="getList">查询</el-button>
+          </div>
+          <div class="title">
+            <div>库存车辆列表</div>
+          </div>
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;">
+            <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column label="操作" width="100px" align="center">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="handleAffirm(scope.row)">确认</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column label="车架号" width="140px" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.mainSid }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="合格证" width="150" align="center">
+              <template slot-scope="scope">
+                <el-select v-model="scope.row.certificate" placeholder="请选择" style="width: 80%"
+                           @change="changeCertificateType(scope.row,this)" clearable>
+                  <el-option v-for="item in certificateType_list" :key="item.dictKey" :label="item.dictValue"
+                             :value="item.dictValue"></el-option>
+                </el-select>
+              </template>
+            </el-table-column>
+            <el-table-column label="存放地点" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.location }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="上次盘库日期" align="center" width="150px">
+              <template slot-scope="scope">
+                <span>{{ scope.row.lastDate }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="上次盘库人员" align="center" width="150px">
+              <template slot-scope="scope">
+                <span>{{ scope.row.lastName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="状态" width="150" align="center">
+              <template slot-scope="scope">
+                <el-select v-model="scope.row.InventoryState" placeholder="请选择" style="width: 80%"
+                           @change="changeStateType(scope.row,this)" clearable>
+                  <el-option v-for="item in stateType_list" :key="item.dictKey" :label="item.dictValue"
+                             :value="item.dictValue"></el-option>
+                </el-select>
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" align="center">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.remarks" placeholder="" clearable></el-input>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/kucunguanli/panku'
+import { fetchByUseOrgSid, getUserByOrgSid, typeValues } from '@/api/cheliang/dictcommons'
+
+export default {
+  name: 'hegezhengpandianjiluAdd',
+  data() {
+    return {
+      listLoading: false,
+      viewState: 1,
+      index: 0,
+      tableKey: 0,
+      list: [],
+      warehouse_list: [],
+      staff_list: [],
+      certificateType_list: [],
+      stateType_list: [
+        {
+          dictKey: 1,
+          dictValue: '通过'
+        },
+        {
+          dictKey: 2,
+          dictValue: '不通过'
+        }
+      ],
+      // 表单数据
+      temp: {
+        sid: '',
+        mainSid: '',
+        location: '',
+        lastData: '',
+        lastName: '',
+        inventoryName: '',
+        inventorySid: '',
+        certificate: '',
+        certificateKey: '',
+        InventoryState: '',
+        InventoryStateKey: '',
+        remarks: '',
+        loginName: window.sessionStorage.getItem('name'),
+        loginSid: window.sessionStorage.getItem('userSid')
+      },
+      listQuery: {
+        params: {
+          locationSid: '',
+          mainSid: '',
+          createOrgSid: ''
+        },
+        current: 1,
+        size: 10,
+        total: 0
+      },
+      rules: {},
+      submitdisabled: false
+    }
+  },
+  methods: {
+    init() {
+      getUserByOrgSid({
+        orgSid: this.listQuery.params.createOrgSid,
+        userSid: window.sessionStorage.getItem('userSid')
+      }).then((res) => {
+        if (res.success) {
+          this.staff_list = res.data
+        }
+      })
+      fetchByUseOrgSid({ sid: this.listQuery.params.createOrgSid }).then((res) => {
+        if (res.success) {
+          this.warehouse_list = res.data
+        }
+      })
+      typeValues({ type: 'certificate' }).then((res) => {
+        if (res.success) {
+          this.certificateType_list = res.data
+        }
+      })
+      this.getList()
+    },
+    // 序号
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    showAdd(createOrgSid) {
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      this.listQuery.params.createOrgSid = createOrgSid
+      this.init()
+    },
+    getList() {
+      req.pagelist(this.listQuery).then((res) => {
+        if (res.success) {
+          this.list = res.data.records
+        } else {
+          this.list = []
+        }
+      })
+    },
+    handleSelect() {
+      this.getList()
+    },
+    changeLocation(value) {
+      this.listQuery.params.locationSid = value
+      this.getList()
+    },
+    changeStateType(row) {
+      let bb = null
+      this.stateType_list.forEach((e) => {
+        if (e.dictValue === row.InventoryState) {
+          bb = {
+            key: e.dictKey,
+            value: e.dictValue
+          }
+        }
+      })
+      row.InventoryStateKey = bb.key
+    },
+    changeCertificateType(row) {
+      let bb = null
+      this.certificateType_list.forEach((e) => {
+        if (e.dictValue === row.certificate) {
+          bb = {
+            key: e.dictKey,
+            value: e.dictValue
+          }
+        }
+      })
+      row.certificateKey = bb.key
+    },
+    changeInventoryName(value) {
+      let bb = null
+      this.staff_list.forEach((e) => {
+        if (e.sid === value) {
+          bb = {
+            name: e.name,
+            sid: e.sid
+          }
+        }
+      })
+      this.listQuery.params.inventoryName = bb.name
+      this.temp.inventoryName = bb.name
+      this.temp.inventorySid = bb.sid
+    },
+    handleAffirm(row) {
+      this.temp.sid = row.sid
+      this.temp.mainSid = row.mainSid
+      this.temp.location = row.location
+      this.temp.certificate = row.certificate
+      this.temp.certificateKey = row.certificateKey
+      this.temp.InventoryState = row.InventoryState
+      this.temp.InventoryStateKey = row.InventoryStateKey
+      this.temp.remarks = row.remarks
+      console.log(this.temp)
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.saveInventory(this.temp).then((resp) => {
+            this.submitdisabled = false
+            if (resp.success) {
+              this.$message({
+                showClose: true,
+                type: 'success',
+                message: resp.msg
+              })
+              this.getList()
+              // this.handleReturn('true')
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    // 返回（===既判断）
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
+      // 表单数据
+      this.$refs['form_obj'].resetFields()
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.formadd .btn {
+  padding: 5px 0;
+  border: 1px solid #e0e3eb;
+  text-align: center;
+  margin-bottom: 5px;
+}
+
+.spe_style{
+
+}
+
+</style>