Browse Source

业务管理——调整表格行内样式; 供应链——调整表格样式、验车单

zhanglei
Zhao Qiqi 3 years ago
parent
commit
3d331261d7
  1. 8
      anrui-buscenter/anrui-buscenter-ui/src/styles/element-table.scss
  2. 2
      anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/vehiclelibraryconfiguration.vue
  3. 2
      anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/modelsToChoose.vue
  4. 2
      anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/vehiclelibraryconfiguration.vue
  5. 2
      anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/xunidingdanxuanze.vue
  6. 2
      anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/yixiangchexingxuanze.vue
  7. 10
      anrui-scm/anrui-scm-ui/src/api/supplychain/yancheguanli.js
  8. 2
      anrui-scm/anrui-scm-ui/src/components/uploadFile/upload_chexing.vue
  9. 34
      anrui-scm/anrui-scm-ui/src/components/uploadFile/upload_jianchabiao.vue
  10. 8
      anrui-scm/anrui-scm-ui/src/styles/element-table.scss
  11. 1
      anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue
  12. 140
      anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/vehiclechecklist.vue
  13. 2
      anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue
  14. 3
      anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliInfo.vue

8
anrui-buscenter/anrui-buscenter-ui/src/styles/element-table.scss

@ -9,6 +9,14 @@
}
}
.el-table {
.el-table__row {
.cell {
line-height:15px;
}
}
}
.el-table {
.el-table__body {
tr td {

2
anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/vehiclelibraryconfiguration.vue

@ -125,7 +125,7 @@
<div class="">
<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="常用配置" align="center">
<el-table-column label="常用配置" align="left" header-align="center">
<template slot-scope="scope">
<span class="bluezi" @click="handlink(scope.row)">{{ scope.row.configName }}</span>
</template>

2
anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/modelsToChoose.vue

@ -47,7 +47,7 @@
<span>{{ scope.row.modelName }}</span>
</template>
</el-table-column>
<el-table-column label="常用配置" align="center">
<el-table-column label="常用配置" align="left" header-align="center">
<template slot-scope="scope">
<span>{{ scope.row.configName }}</span>
</template>

2
anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/vehiclelibraryconfiguration.vue

@ -129,7 +129,7 @@
@selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="50"/>
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="常用配置" align="center">
<el-table-column label="常用配置" align="left" header-align="center">
<template slot-scope="scope"> <!---->
<span>{{ scope.row.configName }}</span>
</template>

2
anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/xunidingdanxuanze.vue

@ -42,7 +42,7 @@
<span>{{ scope.row.modelAlias }}</span>
</template>
</el-table-column>
<el-table-column label="常用配置" align="center">
<el-table-column label="常用配置" align="left" header-align="center">
<template slot-scope="scope">
<span>{{ scope.row.config }}</span>
</template>

2
anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/yixiangchexingxuanze.vue

@ -42,7 +42,7 @@
<span>{{ scope.row.modelAlias }}</span>
</template>
</el-table-column>
<el-table-column label="常用配置" align="center">
<el-table-column label="常用配置" align="left" header-align="center">
<template slot-scope="scope">
<span>{{ scope.row.config }}</span>
</template>

10
anrui-scm/anrui-scm-ui/src/api/supplychain/yancheguanli.js

@ -55,6 +55,16 @@ export function getVehinspectItemInfo(vehInspectSid) {
})
}
// 保存 验车单
export function saveResultImage(data) {
return request({
url: '/scm/v1/scmvehinspectitem/saveResultImage',
data,
method: 'post',
headers: { 'Content-Type': 'application/json' }
})
}
// 数据字典
export function typeValues(data) {
return request({

2
anrui-scm/anrui-scm-ui/src/components/uploadFile/upload_chexing.vue

@ -143,8 +143,8 @@
url: file.response.data.fullUrl,
size: file.response.data.size
})
this.$emit('change', this.files)
this.$emit('eett', this.files)
this.$emit('change', this.files)
// this.getUrl()
// SaveList(this.tempInfo).then(response => {
// if (response.success) {

34
anrui-scm/anrui-scm-ui/src/components/uploadFile/upload_jianchabiao.vue

@ -5,28 +5,28 @@
</el-dialog>
<el-upload class="upload-demo" :headers="accessToken" :action="uploadFile" :accept="accept" :data="uploadData"
:on-success="uploadImgSuccess_FuJian" :on-remove="handleRemove" :file-list="fileList_FuJian"
:on-preview="handlePictureCardPreview">
:on-preview="handlePictureCardPreview" :show-file-list="false">
<el-button size="small" type="primary">点击上传</el-button>
</el-upload>
</div>
</template>
<script>
import { uploadFile } from '@/api/portal/Upload.js'
import { getStorage } from '@/utils/auth.js' //token
import { mapGetters } from 'vuex'
import { uploadFile } from '@/api/portal/Upload.js'
import { getStorage } from '@/utils/auth.js' //token
import { mapGetters } from 'vuex'
export default {
model: {
prop: 'name',
event: 'change'
export default {
model: {
prop: 'name',
event: 'change'
},
props: {
placeholder: {
type: String,
default: ''
},
props: {
placeholder: {
type: String,
default: ''
},
bucket: {
bucket: {
type: String,
default: 'abc'
},
@ -140,11 +140,7 @@
//
this.filedUrl = this.fileUrl + file.response.data
// var uid = file.response.data
this.files.push({
name: file.response.data.sourceFileName,
url: file.response.data.fullUrl,
size: file.response.data.size
})
this.files.push(file.response.data.fullUrl)
this.$emit('change', this.files)
this.$emit('eett', this.files)
}

8
anrui-scm/anrui-scm-ui/src/styles/element-table.scss

@ -9,6 +9,14 @@
}
}
.el-table {
.el-table__row {
.cell {
line-height:15px;
}
}
}
.el-table {
.el-table__body {
tr td {

1
anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue

@ -484,6 +484,7 @@ export default {
//
getList() {
this.listLoading = true
console.log('123456')
pagerList(this.listQuery).then((response) => {
console.log('列表查询结果:', response)
this.listLoading = false

140
anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/vehiclechecklist.vue

@ -3,13 +3,13 @@
<div class="tab-header webtop">
<div>验车单</div>
<div>
<el-button type="primary" size="small" @click="handleCreate">保存</el-button>
<el-button type="primary" size="small" :disabled="disable" @click="handleCreate">保存</el-button>
<el-button type="info" size="small" @click="handleReturn">关闭</el-button>
</div>
</div>
<el-form class="formadd">
<div>
<el-table :data="tableData" border style="width: 100%; margin-top: 20px" max-height="600">
<el-table :data="scmResultImageDtos" border style="width: 100%; margin-top: 20px" max-height="600">
<el-table-column label="序号" width="70" align="center">
<template slot-scope="scope">
<span>{{ scope.row.sortNo }}</span>
@ -38,17 +38,27 @@
<el-input v-model="scope.row.remarks" clearable placeholder="" resize="none" type="textarea" :autosize="{ minRows: 2, maxRows: 8 }"></el-input>
</template>
</el-table-column>
<el-table-column label="操作" header-align="center" align="left" width="360">
<el-table-column label="操作" header-align="center" align="left" width="410">
<template slot-scope="scope">
<div v-if="scope.row.itemImgVoList.length > 0">
<div class="operate" v-for="item in scope.row.itemImgVoList">
<div class="operate" v-for="(item,index) in scope.row.itemImgVoList">
<div>
<span>{{ item.imgTitle }}</span>
</div>
<div>
<el-button type="primary" size="small" @click="handleLookImg">查看</el-button>
<el-button type="primary" size="small" @click="handleUpload">上传</el-button>
<el-button type="primary" size="small" @click="handleExample">图片示例</el-button>
<el-button type="primary" size="small"
@click="handleLookImg(scope.row.itemImgVoList[index].imgUrlList)">查看
</el-button>
<div class="upload_img"> <!-- @change="getUrl($event, index,scope.$index)" -->
<upload_jianchabiao ref="uploadMoreImg"
v-model="scope.row.itemImgVoList[index].imgUrlList"
:limit="1" bucket="map"
:upload-data="{type:'0001'}"/>
</div>
<!-- <el-button type="primary" size="small" @click="handleUpload">上传</el-button>-->
<el-button type="primary" size="small"
@click="handleExample(scope.row.itemImgVoList[index].imgPathList)">图片示例
</el-button>
</div>
</div>
</div>
@ -57,19 +67,59 @@
</el-table>
</div>
</el-form>
<!-- 查看上传图片弹窗 -->
<el-dialog title="开票信息图片" :visible.sync="dialogVisible">
<div v-for="(item,index) in dialogUrl" style="display:inline-block;">
<div class="dialogImg">
<el-image
:key="index"
:src="item"
style="width: 100px; height: 100px"
:preview-src-list="dialogUrl">
</el-image>
<el-button class="btn_style" type="danger" size="mini" @click="handleDel(index)">删除</el-button>
</div>
</div>
</el-dialog>
<!-- 查看图片示例弹窗 -->
<el-dialog title="开票信息图片" :visible.sync="dialogVisiblePath">
<div v-for="(item,index) in dialogimgPathList" style="display:inline-block;">
<div class="dialogImg">
<el-image
:key="index"
:src="item"
style="width: 100px; height: 100px"
:preview-src-list="dialogimgPathList">
</el-image>
</div>
</div>
</el-dialog>
</div>
</template>
<script>
import { getVehinspectItemInfo } from '@/api/supplychain/yancheguanli'
import upload from '@/components/uploadFile/upload'
import { getVehinspectItemInfo, saveResultImage } from '@/api/supplychain/yancheguanli'
import upload_jianchabiao from '@/components/uploadFile/upload_jianchabiao'
export default {
name: 'cheliangjianchabiao',
components: {
upload_jianchabiao
},
data() {
return {
formobj: {},
tableData: [],
temp: {
vehInspectSid: '',
scmResultImageDtos: []
},
disable: false,
scmResultImageDtos: [],
dialogVisible: false,
dialogUrl: [], //
dialogVisiblePath: false,
dialogimgPathList: [], //
aa: [1, 3, 0, 0]
}
},
@ -77,27 +127,61 @@ export default {
// this.showEdit()
},
methods: {
handleCreate() {},
handleCreate() {
this.temp.scmResultImageDtos = this.scmResultImageDtos
// this.$refs['dataForm'].validate((valid) => {
// if (valid) {
this.disable = true
//
saveResultImage(this.temp).then((response) => {
this.disable = false
if (response.code === '200') {
this.handleReturn()
} else {
this.$message({
showClose: true,
message: '保存失败!',
type: 'error'
})
}
})
// }
// })
},
handleReturn() {
this.$emit('doback')
},
showCheck(inspectedSid) {
const vehInspectSid = inspectedSid
this.temp.vehInspectSid = vehInspectSid
getVehinspectItemInfo(vehInspectSid).then((resp) => {
if (resp.success) {
this.tableData = resp.data
this.scmResultImageDtos = resp.data
}
})
},
handleLookImg(){
},
handleUpload(){
//
handleLookImg(val) {
console.log('上传图片', val)
this.dialogVisible = true
this.dialogUrl = val
},
handleExample(){
//
handleExample(val) {
console.log('图片示例', val)
this.dialogVisiblePath = true
this.dialogimgPathList = val
},
handleDel(index) {
this.dialogUrl.splice(index, 1)
// this.dialogUrl.forEach((item, index) => {
// if (item === val) {
// this.dialogUrl.splice(index, 1)
// }
// })
}
// getUrl(){
// }
// arraySpanMethod({ row, column, rowIndex, columnIndex }) {
// console.log(rowIndex, columnIndex)
// if (columnIndex === 0 || columnIndex === 1 || columnIndex === 3 || columnIndex === 4 || columnIndex === 5) {
@ -118,6 +202,7 @@ export default {
.btn {
border-bottom: 1px solid #e0e3eb;
}
.operate {
display: flex;
flex-direction: row;
@ -125,7 +210,20 @@ export default {
align-items: center;
padding-top: 5px;
}
.con_style{
.con_style {
padding: 2px 0;
}
.upload_img {
display: inline-block;
padding: 0 10px;
}
.dialogImg{
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
}
</style>

2
anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue

@ -84,7 +84,7 @@
</el-form-item>
</el-col>
<el-col :span="2">
<!-- <el-button type="primary" size="small" @click="handleChecklist()">车辆检查表</el-button>-->
<el-button type="primary" size="small" @click="handleChecklist()">车辆检查表</el-button>
</el-col>
</el-row>
</div>

3
anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliInfo.vue

@ -50,7 +50,7 @@
</el-col>
<el-col :span="2">
<el-form-item>
<!-- <el-button type="primary" size="small" @click="handleChecklist()">车辆检查表</el-button>-->
<el-button type="primary" size="small" @click="handleChecklist()">车辆检查表</el-button>
</el-form-item>
</el-col>
</el-row>
@ -168,6 +168,7 @@ export default {
getCarInspected(row.inspectedSid).then((res) => {
if (res.success) {
this.temp = res.data
this.temp.inspectedSid = row.inspectedSid
}
})
},

Loading…
Cancel
Save