Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-ui/src/api/cheliang/basevehiclecertificate.js

@@ -75,3 +75,23 @@ export function certificateYJ(data) {
     headers: { 'Content-Type': 'application/json' }
   })
 }
+
+// 合格证移交记录
+export function hgzPagerList(data) {
+  return request({
+    url: '/buscenter/v1/BusTransferRecords/hgzPagerList',
+    method: 'post',
+    data: data,
+    headers: { 'Content-Type': 'application/json' }
+  })
+}
+
+// 合格证移交记录--详情
+export function getInvoiceInfoHgz(data) {
+  return request({
+    url: '/buscenter/v1/BusTransferRecords//getInvoiceInfoHgz',
+    method: 'get',
+    params: data
+  })
+}
+

anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhang.vue

@@ -75,7 +75,7 @@
             </el-table-column>
             <el-table-column label="移交状态" width="120px" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.transferStateValue }}</span>
+                <span class="bluezi" @click="handleLook(scope.row)">{{ scope.row.transferStateValue }}</span>
               </template>
             </el-table-column>
             <el-table-column label="到证日期" width="140px" align="center">
@@ -134,6 +134,7 @@
     <hegezhengtaizhang-add v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="getList"></hegezhengtaizhang-add>
     <hegezheng-info v-show="viewState == 4" ref="divinfo" @doback="resetState"></hegezheng-info>
     <cheliangtaizhang-info v-show="viewState == 5" ref="chelianginfo" @doback="resetState"></cheliangtaizhang-info>
+    <handoverRecord v-show="viewState == 6" ref="divYiJiao" @doback="resetState"/>
   </div>
 </template>
 
@@ -145,6 +146,7 @@ import pageye from '@/components/pagination/pageye'
 import hegezhengtaizhangAdd from './hegezhengtaizhangAdd'
 import hegezhengInfo from './hegezhengInfo'
 import cheliangtaizhangInfo from '@/views/cheliang/cheliangtaizhang/cheliangtaizhangInfo'
+import handoverRecord from './relation/handoverRecord'
 import ButtonBar from '@/components/ButtonBar'
 
 export default {
@@ -155,7 +157,8 @@ export default {
     pageye,
     hegezhengtaizhangAdd,
     hegezhengInfo,
-    ButtonBar
+    ButtonBar,
+    handoverRecord
   },
   // directives: {
   //   drag: {
@@ -549,8 +552,11 @@ export default {
       this.imgs = row.certificatePhoto
       this.dialogFormVisible = true
       this.dialogTitle = '查看'
+    },
+    handleLook(row) {
+      this.viewState = 6
+      this.$refs['divYiJiao'].init(row)
     }
-
   }
 }
 </script>

anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/relation/handoverRecord.vue

@@ -0,0 +1,151 @@
+<template>
+  <div class="app-container">
+    <!-- Start 列表页面 -->
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <!--标题-->
+        <div>{{ viewTitle }}</div>
+        <!--start 添加修改按钮-->
+        <div>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <div class="listconadd">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
+          <el-row style="border-top: 1px solid #E0E3EB">
+            <el-col :span="4" class="tleftb">
+              <span>车架号</span>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item><span>{{ formobj.vinNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="4" class="tleftb">
+              <span>物品名称</span>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item>
+                <span>合格证</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-table :key="tableKey" v-loading="listLoading" :data="formobj.list" :index="index" border style="width: 100%;">
+            <el-table-column width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column label="操作" width="80" align="center">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column label="移交人" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.transferName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="移交部门" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.transferDept }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="接收人" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.receiveName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="接收部门" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.receiveDept }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="移交时间" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.createTime }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="接收状态" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.receiveState == '0' ? '待接收' : '已接收'  }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form>
+      </div>
+    </div>
+    <handoverRecordInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
+  </div>
+</template>
+
+<script>
+import { hgzPagerList } from '@/api/cheliang/basevehiclecertificate'
+import handoverRecordInfo from './handoverRecordInfo'
+
+export default {
+  name: 'WuPinYiJiaoJiLu',
+  components: {
+    handoverRecordInfo
+  },
+  data() {
+    return {
+      viewState: 1,
+      // 查询条件 -----------
+      tableKey: 0,
+      index: 0,
+      viewTitle: '物品移交记录',
+      listLoading: false,
+      listQuery: {
+        params: {
+          vehSid: '',
+          orgPath: window.sessionStorage.getItem('defaultOrgPath')
+        },
+        current: 1,
+        size: 5,
+        total: 0
+      },
+      formobj: {
+        vinNo: '',
+        list: []
+      },
+      rules: {}
+    }
+  },
+  methods: {
+    init(row) {
+      this.listQuery.params.vehSid = row.vehicleSid
+      this.formobj.vinNo = row.vinNo
+      this.getList()
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      hgzPagerList(this.listQuery).then((response) => {
+        console.log('列表查询结果：', response)
+        this.listLoading = false
+        if (response.success) {
+          this.formobj.list = response.data.records
+        } else {
+          this.formobj.list = []
+        }
+      })
+    },
+    toInfo(row) {
+      this.viewState = 2
+      this.$refs['divInfo'].init(row)
+    },
+    resetState() {
+      this.viewState = 1
+    },
+    handleReturn() {
+      this.listQuery = {
+        params: {
+          vehSid: '',
+          orgPath: window.sessionStorage.getItem('defaultOrgPath')
+        },
+        current: 1,
+        size: 5,
+        total: 0
+      }
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+<style scoped>
+</style>

anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/relation/handoverRecordInfo.vue

@@ -0,0 +1,168 @@
+<template>
+  <div class="app-container">
+    <!-- Start 列表页面 -->
+    <div class="tab-header webtop">
+      <!--标题-->
+      <div>{{ viewTitle }}</div>
+      <!--start 添加修改按钮-->
+      <div>
+        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+      </div>
+    </div>
+    <div class="listconadd">
+      <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"><span>车架号</span></div>
+            <el-form-item><span class="addinputInfo">{{ formobj.vinNo }}</span></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty"><span>物品名称</span></div>
+            <el-form-item><span class="addinputInfo">合格证</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="span-sty"><span>移交数量</span></div>
+            <el-form-item><span class="addinputInfo">{{ formobj.transferNum }}</span></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty"><span>物品单位</span></div>
+            <el-form-item><span class="addinputInfo">{{ formobj.goodsUnit }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="span-sty"><span>移交人</span></div>
+            <el-form-item><span class="addinputInfo">{{ formobj.transferName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty"><span>移交部门</span></div>
+            <el-form-item><span class="addinputInfo">{{ formobj.transferDept }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty"><span>移交备注</span></div>
+            <el-form-item><span class="addinputInfo">{{ formobj.transferRemarks }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty"><span>移交附件</span></div>
+            <el-form-item>
+              <div class="addinputInfo">
+                <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item, index) in formobj.filePathList" :key="index" :src="item" :preview-src-list="formobj.filePathList"/>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="span-sty"><span>接收人</span></div>
+            <el-form-item><span class="addinputInfo">{{ formobj.receiveName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty"><span>接收部门</span></div>
+            <el-form-item><span class="addinputInfo">{{ formobj.receiveDept }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="span-sty"><span>接收时间</span></div>
+            <el-form-item><span class="addinputInfo">{{ formobj.receiveTime }}</span></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty"><span>接收状态</span></div>
+            <el-form-item><span class="addinputInfo">{{ formobj.receiveState == '0' ? '待接收' : '已接收' }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty"><span>接收备注</span></div>
+            <el-form-item><span class="addinputInfo">{{ formobj.receiveRemarks }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty"><span>接收附件</span></div>
+            <el-form-item>
+              <div class="addinputInfo">
+                <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item, index) in formobj.receiveFilesList" :key="index" :src="item" :preview-src-list="formobj.receiveFilesList"/>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getInvoiceInfoHgz } from '@/api/cheliang/basevehiclecertificate'
+
+export default {
+  name: 'YiJiaoJiLuXiangQing',
+  data() {
+    return {
+      viewTitle: '交接记录详情',
+      formobj: {
+        filePathList: [],
+        invoiceTitle: '',
+        invoiceType: '',
+        invoicingName: '',
+        receiveDept: '',
+        receiveFiles: '',
+        receiveFilesList: [],
+        receiveName: '',
+        receiveRemarks: '',
+        receiveState: '',
+        receiveTime: '',
+        transferDept: '',
+        transferFiles: '',
+        transferName: '',
+        transferRemarks: '',
+        vinNo: ''
+      }
+    }
+  },
+  methods: {
+    init(row) {
+      getInvoiceInfoHgz({ sid: row.sid }).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+        }
+      })
+    },
+    handleReturn() {
+      this.formobj = {
+        filePathList: [],
+        invoiceTitle: '',
+        invoiceType: '',
+        invoicingName: '',
+        receiveDept: '',
+        receiveFiles: '',
+        receiveFilesList: [],
+        receiveName: '',
+        receiveRemarks: '',
+        receiveState: '',
+        receiveTime: '',
+        transferDept: '',
+        transferFiles: '',
+        transferName: '',
+        transferRemarks: '',
+        vinNo: ''
+      }
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+<style scoped>
+.span-sty {
+  width: 100px !important;
+}
+.addinputInfo {
+  margin-left: 90px !important;
+}
+</style>