yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
God 2 years ago
parent
3700ddd4cc 9495bb0ec1
commit
dd82a3bdb5
8 changed files with 178 additions and 63 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
  2. 83
      anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankuAdd.vue
  3. 33
      anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankuguanli.vue
  4. 37
      anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue
  5. 11
      anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue
  6. 11
      anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue
  7. 49
      anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue
  8. 11
      anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue

6
anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
View File

@ -291,14 +291,14 @@ const codemenu = [
}, },
// 采购退库 // 采购退库
{ {
path: '/caigoutuiku', path: '/supplychain',
component: Layout, component: Layout,
redirect: '/caigoutuiku/index', redirect: '/supplychain/caigoutuiku',
meta: { meta: {
title: '采购退库' title: '采购退库'
}, },
children: [{ children: [{
path: '/caigoutuiku/index', path: '/supplychain/caigoutuiku',
component: () => import('@/views/supplychain/caigoutuiku/caigoutuiku.vue'), component: () => import('@/views/supplychain/caigoutuiku/caigoutuiku.vue'),
name: 'caigoutuiku', name: 'caigoutuiku',
meta: { title: '采购退库', noCache: true } meta: { title: '采购退库', noCache: true }

83
anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankuAdd.vue
View File

@ -28,7 +28,7 @@
<div class="span-sty spanOneWidth"><span>盘库人员:</span></div> <div class="span-sty spanOneWidth"><span>盘库人员:</span></div>
<el-form-item> <el-form-item>
<el-select v-model="recipientList" placeholder="请选择" multiple filterable style="width: 40%" @change="changeInventoryName" class="addinputwOne"> <el-select v-model="recipientList" placeholder="请选择" multiple filterable style="width: 40%" @change="changeInventoryName" class="addinputwOne">
<el-option v-for="item in staff_list" :key="item.sid" :label="item.namePath" :value="item.sid"></el-option> <el-option v-for="item in staff_list" :key="item.namePath" :label="item.namePath" :value="item.sid"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -52,8 +52,8 @@
<el-button class="btntopblueline" type="primary" size="mini" @click="handleAdd">盘盈</el-button> <el-button class="btntopblueline" type="primary" size="mini" @click="handleAdd">盘盈</el-button>
</div> </div>
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;"> <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 width="60" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="操作" width="100px" align="center"> <el-table-column label="操作" width="80" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleAffirm(scope.row)">确认</el-button> <el-button type="primary" size="mini" @click="handleAffirm(scope.row)">确认</el-button>
</template> </template>
@ -63,17 +63,17 @@
<span>{{ scope.row.vinNo }}</span> <span>{{ scope.row.vinNo }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="存放地点" align="center"> <el-table-column label="存放地点" align="center" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.location }}</span> <span>{{ scope.row.location }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="上次盘库日期" align="center" width="150px"> <el-table-column label="上次盘库日期" align="center" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.InventoryDate }}</span> <span>{{ scope.row.InventoryDate }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="上次盘库人员" align="center" width="150px"> <el-table-column label="上次盘库人员" align="center" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.inventoryName }}</span> <span>{{ scope.row.inventoryName }}</span>
</template> </template>
@ -85,6 +85,15 @@
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="见证材料" align="center" width="180">
<template slot-scope="scope">
<el-button type="primary" size="small" @click="handleLookImg(scope.row, scope.index)">查看
</el-button>
<div class="upload_img">
<upload_jianchabiao ref="uploadMoreImg" v-model="scope.row.images" :limit="10" bucket="map" :upload-data="{type:'0001'}"/>
</div>
</template>
</el-table-column>
<el-table-column label="备注" align="center"> <el-table-column label="备注" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.remarks" placeholder="" clearable></el-input> <el-input v-model="scope.row.remarks" placeholder="" clearable></el-input>
@ -99,6 +108,19 @@
</div> </div>
</div> </div>
<pankuByPanYing v-show="viewState == 2" ref="divAdd" @doback="restState"/> <pankuByPanYing v-show="viewState == 2" ref="divAdd" @doback="restState"/>
<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(item, index)">删除</el-button>
</div>
</div>
</el-dialog>
</div> </div>
</template> </template>
@ -107,17 +129,22 @@ import req from '@/api/kucunguanli/panku'
import { getUserByOrgSid, fetchByUseOrgSid, typeValues } from '@/api/cheliang/dictcommons' import { getUserByOrgSid, fetchByUseOrgSid, typeValues } from '@/api/cheliang/dictcommons'
import pankuByPanYing from './pankuByPanYing' import pankuByPanYing from './pankuByPanYing'
import Pagination from '@/components/pagination' import Pagination from '@/components/pagination'
import upload_jianchabiao from '@/components/uploadFile/upload_jianchabiao'
export default { export default {
name: 'pankuAdd', name: 'pankuAdd',
components: { components: {
Pagination, Pagination,
pankuByPanYing pankuByPanYing,
upload_jianchabiao
}, },
data() { data() {
return { return {
viewTitle: '盘库操作', viewTitle: '盘库操作',
listLoading: false, listLoading: false,
dialogVisible: false,
dialogUrl: [],
dialogindex: '',
viewState: 1, viewState: 1,
index: 0, index: 0,
tableKey: 0, tableKey: 0,
@ -237,19 +264,6 @@ export default {
} }
this.formobj.inventoryName = aa.join('、') this.formobj.inventoryName = aa.join('、')
this.formobj.inventorySid = bb.join('、') this.formobj.inventorySid = bb.join('、')
// 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.formobj.inventoryName = bb.name
// this.formobj.inventorySid = bb.sid
console.log(this.formobj)
}, },
handleAdd() { handleAdd() {
this.viewState = 2 this.viewState = 2
@ -260,6 +274,10 @@ export default {
this.$message({ showClose: true, type: 'error', message: '结果不能为空' }) this.$message({ showClose: true, type: 'error', message: '结果不能为空' })
return return
} }
if (row.InventoryState !== '正常' && row.images.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请上传见证材料' })
return
}
if (row.InventoryState !== '正常' && row.remarks === '') { if (row.InventoryState !== '正常' && row.remarks === '') {
this.$message({ showClose: true, type: 'error', message: '请填写备注' }) this.$message({ showClose: true, type: 'error', message: '请填写备注' })
return return
@ -273,6 +291,7 @@ export default {
this.formobj.InventoryState = row.InventoryState this.formobj.InventoryState = row.InventoryState
this.formobj.InventoryStateKey = row.InventoryStateKey this.formobj.InventoryStateKey = row.InventoryStateKey
this.formobj.remarks = row.remarks this.formobj.remarks = row.remarks
this.formobj.images = row.images
if (this.formobj.inventoryName === '') { if (this.formobj.inventoryName === '') {
this.formobj.inventorySid = '' this.formobj.inventorySid = ''
} }
@ -302,6 +321,20 @@ export default {
restState() { restState() {
this.viewState = 1 this.viewState = 1
}, },
// 查看上传图片
handleLookImg(row, index) {
this.dialogVisible = true
this.dialogUrl = row.images
this.dialogindex = index
},
handleDel(item, index) {
this.dialogUrl.splice(index, 1)
for (var i = 0; i < this.list[this.index].images.length; i++) {
if (this.list[this.index].images[i] === item) {
this.list[this.index].images.splice(i, 1)
}
}
},
// 返回（===既判断） // 返回（===既判断）
handleReturn(isreload) { handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist') if (isreload === 'true') this.$emit('reloadlist')
@ -359,5 +392,15 @@ export default {
.colOneStyle { .colOneStyle {
border-right: 0px !important; border-right: 0px !important;
} }
.upload_img {
display: inline-block;
padding: 0 10px;
}
.dialogImg{
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
}
</style> </style>

33
anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankuguanli.vue
View File

@ -41,18 +41,18 @@
</div> </div>
<div class=""> <div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;"> <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;">
<el-table-column fixed width="60px" label="序号" type="index" :index="indexMethod" align="center"/> <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="车架号" width="200px" align="center"> <el-table-column label="车架号" width="200" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span> <span>{{ scope.row.vinNo }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="最新盘库日期" align="center" width="140px"> <el-table-column label="最新盘库日期" align="center" width="140">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.InventoryDate }}</span> <span>{{ scope.row.InventoryDate }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="最新存放地点" align="center" width="180px"> <el-table-column label="最新存放地点" align="center" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.location }}</span> <span>{{ scope.row.location }}</span>
</template> </template>
@ -62,11 +62,16 @@
<span>{{ scope.row.inventoryName }}</span> <span>{{ scope.row.inventoryName }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="状态" align="center" width="100px"> <el-table-column label="状态" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.InventoryState }}</span> <span>{{ scope.row.InventoryState }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="见证材料" align="center" width="100">
<template slot-scope="scope">
<el-button type="primary" v-show="scope.row.images.length > 0" size="mini" @click="handleLook(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column label="备注" header-align="center" align="left"> <el-table-column label="备注" header-align="center" align="left">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.remarks }}</span> <span>{{ scope.row.remarks }}</span>
@ -82,6 +87,18 @@
</div> </div>
<pankuAdd v-show="viewState == 2" ref="divAdd" @doback="resetState"/> <pankuAdd v-show="viewState == 2" ref="divAdd" @doback="resetState"/>
<pankubaogaoguanli v-show="viewState == 3" ref="divBaoGao" @doback="resetState"/> <pankubaogaoguanli v-show="viewState == 3" ref="divBaoGao" @doback="resetState"/>
<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>
</div>
</div>
</el-dialog>
</div> </div>
</template> </template>
@ -106,6 +123,8 @@ export default {
data() { data() {
return { return {
btndisabled: false, btndisabled: false,
dialogVisible: false,
dialogUrl: [],
btnList: [ btnList: [
{ {
type: 'primary', type: 'primary',
@ -258,6 +277,10 @@ export default {
} }
this.init() this.init()
}, },
handleLook(row) {
this.dialogVisible = true
this.dialogUrl = row.images
},
toAdd() { toAdd() {
req.getInventoryRecords(window.sessionStorage.getItem('userSid')).then((res) => { req.getInventoryRecords(window.sessionStorage.getItem('userSid')).then((res) => {
if (res.success) { if (res.success) {

37
anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue
View File

@ -193,11 +193,15 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="8">
<div class="span-sty spanOneWidth"><span>厂家入库日期</span></div> <div class="span-sty spanOneWidth"><span>厂家入库日期</span></div>
<el-form-item><el-date-picker value-format="yyyy-MM-dd" v-model="formobj.priceDate" clearable type="date" class="addinputw addinputwOne" placeholder=""/></el-form-item> <el-form-item><el-date-picker value-format="yyyy-MM-dd" v-model="formobj.priceDate" clearable type="date" class="addinputw addinputwOne" placeholder=""/></el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="8">
<div class="span-sty spanOneWidth"><span>公司入库日期</span></div>
<el-form-item><el-date-picker value-format="yyyy-MM-dd" v-model="formobj.orgPriceDate" :picker-options="pickerOptions" clearable type="date" class="addinputw addinputwOne" placeholder=""/></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>物流发车日期</span></div> <div class="span-sty spanOneWidth"><span>物流发车日期</span></div>
<el-form-item><el-date-picker value-format="yyyy-MM-dd" v-model="formobj.departureDate" clearable type="date" class="addinputw addinputwOne" placeholder=""/></el-form-item> <el-form-item><el-date-picker value-format="yyyy-MM-dd" v-model="formobj.departureDate" clearable type="date" class="addinputw addinputwOne" placeholder=""/></el-form-item>
</el-col> </el-col>
@ -225,6 +229,12 @@ export default {
}, },
data() { data() {
return { return {
pickerOptions: {
disabledDate(time) {
let oneDay = 3600 * 1000 * 24 * 5
return Date.now() < time.getTime() || time.getTime() < Date.now() - oneDay
}
},
viewTitle: '', viewTitle: '',
index: 0, index: 0,
tableKey: 0, tableKey: 0,
@ -281,7 +291,8 @@ export default {
scmFiles: [], scmFiles: [],
vehicleList: [], vehicleList: [],
vehicleOrderSid: '', vehicleOrderSid: '',
orgPath: '' orgPath: '',
priceDate: ''
}, },
rules: {}, rules: {},
submitdisabled: false submitdisabled: false
@ -773,14 +784,6 @@ export default {
this.$message({ showClose: true, type: 'error', message: '采购订单编号不能为空' }) this.$message({ showClose: true, type: 'error', message: '采购订单编号不能为空' })
return return
} }
if (this.formobj.priceDate === '' || this.formobj.priceDate === null) {
this.$message({ showClose: true, type: 'error', message: '厂家入库日期不能为空' })
return
}
if (this.formobj.departureDate === '') {
this.$message({ showClose: true, type: 'error', message: '物流发车日期不能为空' })
return
}
if (this.formobj.onceFreight === '') { if (this.formobj.onceFreight === '') {
this.$message({ showClose: true, type: 'error', message: '一次运费不能为空' }) this.$message({ showClose: true, type: 'error', message: '一次运费不能为空' })
return return
@ -789,6 +792,18 @@ export default {
this.$message({ showClose: true, type: 'error', message: '因一次运费不能为零，请完善一次运费' }) this.$message({ showClose: true, type: 'error', message: '因一次运费不能为零，请完善一次运费' })
return return
} }
if (this.formobj.priceDate === '' || this.formobj.priceDate === null) {
this.$message({ showClose: true, type: 'error', message: '厂家入库日期不能为空' })
return
}
if (this.formobj.orgPriceDate === '') {
this.$message({ showClose: true, type: 'error', message: '公司入库日期不能为空' })
return
}
if (this.formobj.departureDate === '') {
this.$message({ showClose: true, type: 'error', message: '物流发车日期不能为空' })
return
}
if (this.freightChecked) { if (this.freightChecked) {
this.formobj.deductionFreight = 0 this.formobj.deductionFreight = 0
} else { } else {

11
anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue
View File

@ -196,11 +196,15 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="8">
<div class="span-sty spanOneWidth"><span>厂家入库日期</span></div> <div class="span-sty spanOneWidth"><span>厂家入库日期</span></div>
<el-form-item><span class="addinputwOne addinputInfo">{{ formobj.priceDate }}</span></el-form-item> <el-form-item><span class="addinputwOne addinputInfo">{{ formobj.priceDate }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="8">
<div class="span-sty spanOneWidth"><span>公司入库日期</span></div>
<el-form-item><span class="addinputwOne addinputInfo">{{ formobj.orgPriceDate }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>物流发车日期</span></div> <div class="span-sty spanOneWidth"><span>物流发车日期</span></div>
<el-form-item><span class="addinputwOne addinputInfo">{{ formobj.departureDate }}</span></el-form-item> <el-form-item><span class="addinputwOne addinputInfo">{{ formobj.departureDate }}</span></el-form-item>
</el-col> </el-col>
@ -281,7 +285,8 @@ export default {
deductionPolicyTwoOne: '', deductionPolicyTwoOne: '',
scmFiles: [], scmFiles: [],
vehicleList: [], vehicleList: [],
vehicleOrderSid: '' vehicleOrderSid: '',
priceDate: ''
}, },
rules: {}, rules: {},
submitdisabled: false submitdisabled: false

11
anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue
View File

@ -198,11 +198,15 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="8">
<div class="span-sty spanOneWidth"><span>厂家入库日期</span></div> <div class="span-sty spanOneWidth"><span>厂家入库日期</span></div>
<el-form-item><span class="addinputwOne addinputInfo">{{ formobj.priceDate }}</span></el-form-item> <el-form-item><span class="addinputwOne addinputInfo">{{ formobj.priceDate }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="8">
<div class="span-sty spanOneWidth"><span>公司入库日期</span></div>
<el-form-item><span class="addinputwOne addinputInfo">{{ formobj.orgPriceDate }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>物流发车日期</span></div> <div class="span-sty spanOneWidth"><span>物流发车日期</span></div>
<el-form-item><span class="addinputwOne addinputInfo">{{ formobj.departureDate }}</span></el-form-item> <el-form-item><span class="addinputwOne addinputInfo">{{ formobj.departureDate }}</span></el-form-item>
</el-col> </el-col>
@ -316,7 +320,8 @@ export default {
deductionPolicyTwoOne: '', deductionPolicyTwoOne: '',
scmFiles: [], scmFiles: [],
vehicleList: [], vehicleList: [],
vehicleOrderSid: '' vehicleOrderSid: '',
priceDate: ''
}, },
// 环节所需参数 // 环节所需参数
linkByParameter: { linkByParameter: {

49
anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue
View File

@ -192,11 +192,15 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="8">
<div class="span-sty spanOneWidth"><span>厂家入库日期</span></div> <div class="span-sty spanOneWidth"><span>厂家入库日期</span></div>
<el-form-item><el-date-picker value-format="yyyy-MM-dd" v-model="formobj.priceDate" clearable type="date" class="addinputw addinputwOne" placeholder=""/></el-form-item> <el-form-item><el-date-picker value-format="yyyy-MM-dd" v-model="formobj.priceDate" clearable type="date" class="addinputw addinputwOne" placeholder=""/></el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="8">
<div class="span-sty spanOneWidth"><span>公司入库日期</span></div>
<el-form-item><el-date-picker value-format="yyyy-MM-dd" v-model="formobj.orgPriceDate" :picker-options="pickerOptions" clearable type="date" class="addinputw addinputwOne" placeholder=""/></el-form-item>
</el-col>
<el-col :span=8>
<div class="span-sty spanOneWidth"><span>物流发车日期</span></div> <div class="span-sty spanOneWidth"><span>物流发车日期</span></div>
<el-form-item><el-date-picker value-format="yyyy-MM-dd" v-model="formobj.departureDate" clearable type="date" class="addinputw addinputwOne" placeholder=""/></el-form-item> <el-form-item><el-date-picker value-format="yyyy-MM-dd" v-model="formobj.departureDate" clearable type="date" class="addinputw addinputwOne" placeholder=""/></el-form-item>
</el-col> </el-col>
@ -224,6 +228,12 @@ export default {
}, },
data() { data() {
return { return {
pickerOptions: {
disabledDate(time) {
let oneDay = 3600 * 1000 * 24 * 5
return Date.now() < time.getTime() || time.getTime() < Date.now() - oneDay
}
},
viewTitle: '', viewTitle: '',
index: 0, index: 0,
tableKey: 0, tableKey: 0,
@ -278,7 +288,8 @@ export default {
scmFiles: [], scmFiles: [],
vehicleList: [], vehicleList: [],
vehicleOrderSid: '', vehicleOrderSid: '',
orgPath: '' orgPath: '',
priceDate: ''
}, },
rules: {}, rules: {},
submitdisabled: false submitdisabled: false
@ -720,10 +731,6 @@ export default {
}, },
saveEdit() { saveEdit() {
this.getUrl() this.getUrl()
if (this.formobj.departureDate === '') {
this.$message({ showClose: true, type: 'error', message: '厂家发车日期不能为空' })
return
}
if (this.formobj.onceFreight === '') { if (this.formobj.onceFreight === '') {
this.$message({ showClose: true, type: 'error', message: '一次运费不能为空' }) this.$message({ showClose: true, type: 'error', message: '一次运费不能为空' })
return return
@ -732,6 +739,14 @@ export default {
this.$message({ showClose: true, type: 'error', message: '因一次运费不能为零，请完善一次运费' }) this.$message({ showClose: true, type: 'error', message: '因一次运费不能为零，请完善一次运费' })
return return
} }
if (this.formobj.departureDate === '') {
this.$message({ showClose: true, type: 'error', message: '厂家发车日期不能为空' })
return
}
if (this.formobj.orgPriceDate === '') {
this.$message({ showClose: true, type: 'error', message: '公司入库日期不能为空' })
return
}
if (this.freightChecked) { if (this.freightChecked) {
this.formobj.deductionFreight = 0 this.formobj.deductionFreight = 0
} else { } else {
@ -792,14 +807,6 @@ export default {
this.$message({ showClose: true, type: 'error', message: '采购订单编号不能为空' }) this.$message({ showClose: true, type: 'error', message: '采购订单编号不能为空' })
return return
} }
if (this.formobj.priceDate === '' || this.formobj.priceDate === null) {
this.$message({ showClose: true, type: 'error', message: '厂家入库日期不能为空' })
return
}
if (this.formobj.departureDate === '') {
this.$message({ showClose: true, type: 'error', message: '物流发车日期不能为空' })
return
}
if (this.formobj.onceFreight === '') { if (this.formobj.onceFreight === '') {
this.$message({ showClose: true, type: 'error', message: '一次运费不能为空' }) this.$message({ showClose: true, type: 'error', message: '一次运费不能为空' })
return return
@ -808,6 +815,18 @@ export default {
this.$message({ showClose: true, type: 'error', message: '因一次运费不能为零，请完善一次运费' }) this.$message({ showClose: true, type: 'error', message: '因一次运费不能为零，请完善一次运费' })
return return
} }
if (this.formobj.priceDate === '' || this.formobj.priceDate === null) {
this.$message({ showClose: true, type: 'error', message: '厂家入库日期不能为空' })
return
}
if (this.formobj.orgPriceDate === '') {
this.$message({ showClose: true, type: 'error', message: '公司入库日期不能为空' })
return
}
if (this.formobj.departureDate === '') {
this.$message({ showClose: true, type: 'error', message: '物流发车日期不能为空' })
return
}
if (this.freightChecked) { if (this.freightChecked) {
this.formobj.deductionFreight = 0 this.formobj.deductionFreight = 0
} else { } else {

11
anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue
View File

@ -196,11 +196,15 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="8">
<div class="span-sty spanOneWidth"><span>厂家入库日期</span></div> <div class="span-sty spanOneWidth"><span>厂家入库日期</span></div>
<el-form-item><span class="addinputwOne addinputInfo">{{ formobj.priceDate }}</span></el-form-item> <el-form-item><span class="addinputwOne addinputInfo">{{ formobj.priceDate }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="8">
<div class="span-sty spanOneWidth"><span>公司入库日期</span></div>
<el-form-item><span class="addinputwOne addinputInfo">{{ formobj.orgPriceDate }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>物流发车日期</span></div> <div class="span-sty spanOneWidth"><span>物流发车日期</span></div>
<el-form-item><span class="addinputwOne addinputInfo">{{ formobj.departureDate }}</span></el-form-item> <el-form-item><span class="addinputwOne addinputInfo">{{ formobj.departureDate }}</span></el-form-item>
</el-col> </el-col>
@ -281,7 +285,8 @@ export default {
deductionPolicyTwoOne: '', deductionPolicyTwoOne: '',
scmFiles: [], scmFiles: [],
vehicleList: [], vehicleList: [],
vehicleOrderSid: '' vehicleOrderSid: '',
priceDate: ''
}, },
// 环节所需参数 // 环节所需参数
linkByParameter: { linkByParameter: {

Write Preview
Loading…
Cancel
Save