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

完善旧件返厂确认

master
yunuo970428 3 days ago
parent
9900c40097
commit
2bc81c834b
3 changed files with 398 additions and 757 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. 327
      yxt-as-ui/src/views/storage/manufacturerconfirm/index.vue
  2. 87
      yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmAdd.vue
  3. 91
      yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmInfo.vue

327
yxt-as-ui/src/views/storage/manufacturerconfirm/index.vue
View File

@ -22,28 +22,21 @@
<el-input v-model="queryParams.params.billNo" placeholder="" clearable/> <el-input v-model="queryParams.params.billNo" placeholder="" clearable/>
</el-form-item> </el-form-item>
<el-form-item label="单据日期"> <el-form-item label="单据日期">
<el-date-picker v-model="queryParams.params.createStartTime" type="date" placeholder="选择日期" <el-date-picker v-model="queryParams.params.createStartTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;"> <span style="padding: 0 8px">至</span>
</el-date-picker>至 <el-date-picker v-model="queryParams.params.createEndTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
<el-date-picker v-model="queryParams.params.createEndTime" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="办结日期"> <el-form-item label="办结日期">
<el-date-picker v-model="queryParams.params.finishStartTime" type="date" placeholder="选择日期" <el-date-picker v-model="queryParams.params.finishStartTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;"> <span style="padding: 0 8px">至</span>
</el-date-picker> <el-date-picker v-model="queryParams.params.finishEndTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
至
<el-date-picker v-model="queryParams.params.finishEndTime" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
</el-form-item> </el-form-item>
<!-- <el-form-item label="厂家确认结果"> <el-form-item label="厂家确认结果">
<el-select v-model="queryParams.params.billState" placeholder="请选择"> <el-select v-model="queryParams.params.confirmResult" placeholder="请选择">
<el-option v-for="(item,i) in confirmResultsList" :key="i" :label="item.name" :value="item.sid"> <el-option v-for="(item,i) in confirmResultsList" :key="i" :label="item.name" :value="item.sid">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> --> </el-form-item>
</el-form> </el-form>
<div class="btn" style="text-align: center;"> <div class="btn" style="text-align: center;">
<el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button> <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
@ -58,14 +51,11 @@
<!-- End 项目列表头部 --> <!-- End 项目列表头部 -->
<!-- Start 项目列表 --> <!-- Start 项目列表 -->
<div class=""> <div class="">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="selectionLineChangeHandle">
@selection-change="selectionLineChangeHandle">
<el-table-column fixed width="50" type="selection" align="center"/> <el-table-column fixed width="50" type="selection" align="center"/>
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/> <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column fixed label="操作" align="center" width="100"> <el-table-column fixed label="操作" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <el-button type="primary" size="mini" :disabled="scope.row.nodeState!='待提交'"
@click="toEdit(scope.row)">办理</el-button> -->
<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">查看</el-button> <el-button type="primary" size="mini" @click="toRelevancy(scope.row)">查看</el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -84,22 +74,13 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="confirmCount" label="厂家确认数量" width="180" align="center"/> <el-table-column prop="confirmCount" label="厂家确认数量" width="180" align="center"/>
<!-- <el-table-column label="厂家确认结果" align="center">
<template slot-scope="scope">
<div style="color: #1890FF; text-decoration: underline ;" @click="showResult(scope.row)">
{{ scope.row.confirmResult }}
</div>
</template>
</el-table-column> -->
</el-table> </el-table>
</div> </div>
<!-- End 项目列表 --> <!-- End 项目列表 -->
<div class="pages"> <div class="pages">
<div class="tit"/> <div class="tit"/>
<!-- 翻页 --> <!-- 翻页 -->
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
:limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
</div> </div>
</div> </div>
</div> </div>
@ -108,126 +89,16 @@
<divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList"/> <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList"/>
<divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList"/> <divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList"/>
<el-dialog title="附件" :visible.sync="dialogVisible" :before-close="handleClose"> <el-dialog title="附件" :visible.sync="dialogVisible" :before-close="handleClose">
<el-form ref="dataForm1" class="formadd" style="margin-top: -30px;"> <el-form ref="dataForm1" class="formadd" style="margin-top: -30px;">
<el-row class="first_row"> <el-row class="first_row">
<el-col :span="24" class="trightb"> <el-col :span="24" class="trightb">
<el-image style="width: 120px;height: 120px; margin: 10px; background: #f0f;" <el-image style="width: 120px;height: 120px; margin: 10px; background: #f0f;" v-for="(item,index) in fileList" :key="index" :src="item" :preview-src-list="[item]">
v-for="(item,index) in fileList" :src="item" :preview-src-list="[item]">
</el-image> </el-image>
</el-col> </el-col>
</el-row> </el-row>
</el-form>
</el-dialog>
<el-dialog title="旧件返厂厂家确认详情" :visible.sync="dialogVisible2" :before-close="handleClose2">
<el-form ref="dataForm1" class="formadd" style="margin-top: -40px;" :model="orderInfo">
<el-row class="first_row">
<el-col :span="8" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">返件数量确认</span>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item class="trightb_item">
<el-radio-group v-model="orderInfo.isUnanimous" size="small" :disabled="true">
<el-radio :label="0">一致</el-radio>
<el-radio :label="1">不一致</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">备注</span>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item class="trightb_item">
<span class="addinputw" style="width:100%">{{orderInfo.remarks}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">附件</span>
</el-form-item>
</el-col>
<el-col :span="16" class="trightb">
<el-form-item class="trightb_item">
<el-image style="width: 120px;height: 120px; margin: 10px; " v-for="(item,index) in orderInfo.filePaths"
:src="item" :preview-src-list="[item]">
</el-image>
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
</el-dialog> </el-dialog>
<el-dialog title="旧件返厂厂家确认" :visible.sync="dialogVisible3" :before-close="handleClose3">
<el-form ref="dataForm1" class="formadd" style="margin-top: -40px;" :model="orderInfo">
<el-row class="first_row">
<el-col :span="8" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">返件数量确认</span>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item class="trightb_item">
<el-radio-group v-model="orderInfo.isUnanimous" size="small">
<el-radio :label="0">一致</el-radio>
<el-radio :label="1">不一致</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">备注</span>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item class="trightb_item">
<!-- <span class="addinputw" style="width:100%">{{orderInfo.remarks}}</span> -->
<el-input v-model="orderInfo.remarks" placeholder="" class="addinputw addinputInfo" clearable />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">附件</span>
</el-form-item>
</el-col>
<el-col :span="16" class="trightb">
<el-form-item class="trightb_item">
<upload-img ref="uploadImg" class="addinputw" v-model="imgList" :limit="50" bucket="map"
:upload-data="{ type: '0001' }" @change="backData" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="btn" style="text-align: center; margin-top: 20px;">
<el-button type="primary" size="mini" @click="saveResult()">保存</el-button>
<el-button type="primary" size="mini" @click="handleClose3()">关闭</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
@ -235,36 +106,29 @@
import req from '@/api/storage/manufacturerconfirm.js' import req from '@/api/storage/manufacturerconfirm.js'
import ButtonBar from '@/components/ButtonBar' import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination' import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import divAdd from './manufacturerconfirmAdd.vue' import divAdd from './manufacturerconfirmAdd.vue'
import divInfo from './manufacturerconfirmInfo.vue' import divInfo from './manufacturerconfirmInfo.vue'
import uploadImg from '@/components/uploadFile/uploadImg'
export default { export default {
components: { components: {
ButtonBar, ButtonBar,
Pagination, Pagination,
pageye,
divAdd, divAdd,
divInfo, divInfo
uploadImg
}, },
data() { data() {
return { return {
dialogVisible: false, dialogVisible: false,
dialogVisible2: false,
dialogVisible3: false,
fileList: [], fileList: [],
orderInfo: {
filePaths: []
},
btndisabled: false, btndisabled: false,
viewState: 1, // 1、列表 2、添加 3、修改 4、查看 viewState: 1, // 1、列表 2、添加 3、修改 4、查看
isSearchShow: false, isSearchShow: false,
searchxianshitit: '显示查询条件', searchxianshitit: '显示查询条件',
tableLoading: false, tableLoading: false,
dataList: [], dataList: [],
btnList: [{ btnList: [
{
type: 'primary', type: 'primary',
size: 'small', size: 'small',
icon: 'plus', icon: 'plus',
@ -285,22 +149,32 @@
size: 10, size: 10,
total: 0, total: 0,
params: { params: {
name: '' useOrgName: '',
deptName: '',
createByName: '',
billNo: '',
createStartTime: '',
createEndTime: '',
finishStartTime: '',
finishEndTime: '',
confirmResult: '',
userSid: '',
orgPath: '',
menuUrl: ''
} }
}, },
sids: [], sids: [],
selectionList: [], selectionList: [],
confirmResultsList: [{ confirmResultsList: [
name: "一致", {
sid: "1" name: '未确认',
sid: '1'
}, },
{ {
name: "不一致", name: '已确认',
sid: "2" sid: '2'
} }
], ]
pathList: [],
imgList: []
} }
}, },
mounted() { mounted() {
@ -313,67 +187,17 @@
handleClose() { handleClose() {
this.dialogVisible = false this.dialogVisible = false
}, },
handleClose2() {
this.dialogVisible2 = false
},
handleClose3() {
this.dialogVisible3 = false
},
showAdjunct(paths) { showAdjunct(paths) {
this.fileList = paths this.fileList = paths
this.dialogVisible = true this.dialogVisible = true
},
saveResult() {
console.log("saveResult", this.orderInfo);
req.saveConfirmResult(this.orderInfo).then((resp) => {
this.dialogVisible3 = false
this.orderInfo = {
filePaths: []
}
this.loadList()
}).catch(() => {
})
},
showResult(row) {
if (row.confirmResult == '未确认') {
this.$message({
type: 'warning',
showClose: true,
message: '厂家暂未确认'
})
} else {
req.fetchDetailsByMainSid(row.sid).then((resp) => {
console.log("fetchDetailsByMainSid", resp);
this.orderInfo = resp.data
this.dialogVisible2 = true
}).catch(() => {
})
}
}, },
selectionLineChangeHandle(val) { selectionLineChangeHandle(val) {
console.log("val", val);
this.selectionList = val this.selectionList = val
const aa = [] const aa = []
val.forEach(element => { val.forEach(element => {
aa.push(element.sid) aa.push(element.sid)
}) })
this.sids = aa this.sids = aa
}, },
// 搜索条件效果 // 搜索条件效果
clicksearchShow() { clicksearchShow() {
@ -386,9 +210,6 @@
}, },
btnHandle(btnKey) { btnHandle(btnKey) {
switch (btnKey) { switch (btnKey) {
case 'doDel':
this.doDel()
break
case 'toAdd': case 'toAdd':
this.toAdd() this.toAdd()
break break
@ -436,61 +257,26 @@
size: 10, size: 10,
total: 0, total: 0,
params: { params: {
name: '' useOrgName: '',
deptName: '',
createByName: '',
billNo: '',
createStartTime: '',
createEndTime: '',
finishStartTime: '',
finishEndTime: '',
confirmResult: '',
userSid: '',
orgPath: '',
menuUrl: ''
} }
} }
this.loadList() this.loadList()
}, },
doDel() {
if (this.sids.length > 0) {
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.deleteBySids(this.sids).then((resp) => {
loading.close()
if (resp.success) {
this.$message({
type: 'success',
message: resp.msg,
showClose: true
})
this.loadList()
} else {
// 根据resp.code进行异常情况处理
}
}).catch(e => {
loading.close()
})
}).catch(() => {})
} else {
this.$message({
type: 'warning',
showClose: true,
message: '请至少选择一条记录进行删除操作'
})
}
},
toAdd() { toAdd() {
if (this.sids.length === 1) {
if (this.sids.length == 1) {
// this.dialogVisible3 = true
// this.orderInfo.mainSid = this.sids[0]
this.viewState = 2 this.viewState = 2
this.$refs['divadd'].showAdd(this.sids[0]) this.$refs['divadd'].showAdd(this.sids[0])
} else { } else {
this.$message({ this.$message({
type: 'warning', type: 'warning',
@ -498,16 +284,11 @@
message: '请选择一条记录' message: '请选择一条记录'
}) })
} }
}, },
toEdit(row) { toEdit(row) {
this.viewState = 3 this.viewState = 3
this.$refs['divadd'].showEdit(row) this.$refs['divadd'].showEdit(row)
}, },
doClose() { doClose() {
this.$store.dispatch('tagsView/delView', this.$route) this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1) this.$router.go(-1)
@ -516,21 +297,9 @@
this.viewState = 4 this.viewState = 4
this.$refs['divinfo'].showEdit(row) this.$refs['divinfo'].showEdit(row)
}, },
resetState() { resetState() {
this.viewState = 1 this.viewState = 1
},
backData(value) {
console.log('backData》》》》', value)
console.log('imgList', this.imgList)
for (var i = 0; i < this.imgList.length; i++) {
this.orderInfo.filePaths.push(this.imgList[i].url)
} }
}
} }
} }
</script> </script>

87
yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmAdd.vue
View File

@ -1,30 +1,15 @@
<template> <template>
<div> <div class="app-container">
<div class="tab-header webtop"> <div class="tab-header webtop">
<!-- 标题 -->
<div>{{ title }}厂家确认</div> <div>{{ title }}厂家确认</div>
<!-- start 添加修改按钮 -->
<div> <div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">确认</el-button> <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">确认</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button> <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div> </div>
<!-- end 添加修改按钮 -->
<!-- end 详情按钮 -->
</div> </div>
<div class="listconadd"> <div class="listconadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02"> <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<!-- <div class="title">
<div>基础信息</div>
</div> -->
<el-row class="first_row"> <el-row class="first_row">
<!-- <el-col :span="12">
<div class="span-sty">单据编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
</el-col> -->
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">申请人</div> <div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
@ -33,7 +18,6 @@
<div class="span-sty">申请部门</div> <div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">申请日期</div> <div class="span-sty">申请日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
@ -43,30 +27,20 @@
<el-col :span="24"> <el-col :span="24">
<div class="span-sty"><span class="must">*</span> 附件</div> <div class="span-sty"><span class="must">*</span> 附件</div>
<el-form-item prop="imgList"> <el-form-item prop="imgList">
<upload-img ref="uploadImg" class="addinputw" v-model="imgList" :limit="50" bucket="map" <upload-img ref="uploadImg" class="addinputw" v-model="imgList" :limit="50" bucket="map" :upload-data="{ type: '0001' }" @change="backData"/>
:upload-data="{ type: '0001' }" @change="backData" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="span-sty">备注</div> <div class="span-sty">备注</div>
<el-form-item> <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" <el-form-item>
type="textarea" :rows="4" clearable /> <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" type="textarea" :rows="4" clearable/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<div class="title">已返厂旧件列表</div>
<div class="title" <el-table v-loading="listLoading" :data="formobj.asOldpartreturnConfirmDetailDetailsList" border style="width: 100%;" :row-style="{height: '40px'}">
style="display: flex;align-items: center;justify-content: space-between;height:40px;margin-top: 10px;">
<div>已返厂旧件列表</div>
</div>
<el-table v-loading="listLoading" :data="formobj.asOldpartreturnConfirmDetailDetailsList" border
style="width: 100%;" :row-style="{height: '40px'}">
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/> <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="商品名称" prop="goodsSpuName" align="center"/> <el-table-column label="商品名称" prop="goodsSpuName" align="center"/>
<el-table-column label="商品编码" prop="goodsSkuCode" align="center"/> <el-table-column label="商品编码" prop="goodsSkuCode" align="center"/>
@ -81,23 +55,19 @@
<el-table-column label="差异说明" prop="remarks" align="center"/> <el-table-column label="差异说明" prop="remarks" align="center"/>
<el-table-column label="确认数量" align="center" width="180"> <el-table-column label="确认数量" align="center" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input ref="focusAssumptionInput" v-model="scope.row.confirmCount" clearable placeholder="" <el-input ref="focusAssumptionInput" v-model="scope.row.confirmCount" clearable placeholder="" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" @input="commodityComputeYHAndXSJE(scope.row)"/>
oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" @input="commodityComputeYHAndXSJE(scope.row)" />
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-form> </el-form>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import req from '@/api/storage/manufacturerconfirm.js' import req from '@/api/storage/manufacturerconfirm.js'
import uploadImg from '@/components/uploadFile/uploadImg' import uploadImg from '@/components/uploadFile/uploadImg'
export default { export default {
components: { components: {
uploadImg uploadImg
@ -106,15 +76,11 @@
return { return {
listLoading: false, listLoading: false,
submitdisabled: false, submitdisabled: false,
title: "新增", title: '新增',
formobj: {}, formobj: {},
imgList: [], imgList: [],
rules: { rules: {
filePaths: [{ filePaths: [{ required: true, message: '附件不能为空', trigger: 'blur' }]
required: true,
message: '附件不能为空',
trigger: 'blur'
}],
} }
} }
}, },
@ -129,13 +95,11 @@
this.submitdisabled = false this.submitdisabled = false
this.$emit('doback') this.$emit('doback')
}, },
showAdd(sid) { showAdd(sid) {
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['form_obj'].clearValidate() this.$refs['form_obj'].clearValidate()
}) })
req.init(sid) req.init(sid).then(resp => {
.then(resp => {
if (resp.success) { if (resp.success) {
this.formobj = resp.data this.formobj = resp.data
for (var i = 0; i < resp.data.filePaths.length; i++) { for (var i = 0; i < resp.data.filePaths.length; i++) {
@ -144,8 +108,7 @@
}) })
} }
} }
}) }).catch(e => {
.catch(e => {
this.formobj = {} this.formobj = {}
}) })
}, },
@ -153,39 +116,28 @@
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['form_obj'].clearValidate() this.$refs['form_obj'].clearValidate()
}) })
var params = { req.init(row.sid).then(resp => {
sid: row.sid
}
req.init(row.sid)
.then(resp => {
if (resp.success) { if (resp.success) {
this.formobj = resp.data this.formobj = resp.data
} }
}) }).catch(e => {
.catch(e => {
this.formobj = {} this.formobj = {}
}) })
}, },
backData(value) { backData(value) {
console.log('backData》》》》', value)
console.log('imgList', this.imgList) console.log('imgList', this.imgList)
this.imgList = value this.imgList = value
this.formobj.filePaths = [] this.formobj.filePaths = []
for (var i = 0; i < this.imgList.length; i++) { for (var i = 0; i < this.imgList.length; i++) {
this.formobj.filePaths.push(this.imgList[i].url) this.formobj.filePaths.push(this.imgList[i].url)
} }
}, },
commodityComputeYHAndXSJE(row) { commodityComputeYHAndXSJE(row) {
if (Number(row.actualReturnCount) < Number(row.confirmCount)) { if (Number(row.actualReturnCount) < Number(row.confirmCount)) {
row.confirmCount = Number(row.actualReturnCount) row.confirmCount = Number(row.actualReturnCount)
} }
}, },
saveOrUpdate() { saveOrUpdate() {
this.$refs['form_obj'].validate((valid) => { this.$refs['form_obj'].validate((valid) => {
if (valid) { if (valid) {
this.submitdisabled = true this.submitdisabled = true
@ -205,8 +157,7 @@
}) })
} }
}) })
}
},
} }
} }
</script> </script>
@ -235,12 +186,4 @@
.first_row { .first_row {
border-top: 1px solid #E0E3EB; border-top: 1px solid #E0E3EB;
} }
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
</style> </style>

91
yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmInfo.vue
View File

@ -1,29 +1,14 @@
<template> <template>
<div> <div class="app-container">
<div class="tab-header webtop"> <div class="tab-header webtop">
<!-- 标题 -->
<div>厂家确认</div> <div>厂家确认</div>
<!-- start 添加修改按钮 -->
<div> <div>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button> <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div> </div>
<!-- end 添加修改按钮 -->
<!-- end 详情按钮 -->
</div> </div>
<div class="listconadd"> <div class="listconadd">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02"> <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<!-- <div class="title">
<div>基础信息</div>
</div> -->
<el-row class="first_row"> <el-row class="first_row">
<!-- <el-col :span="12">
<div class="span-sty">单据编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
</el-col> -->
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">申请人</div> <div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
@ -32,60 +17,31 @@
<div class="span-sty">申请部门</div> <div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">申请日期</div> <div class="span-sty">申请日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col> </el-col>
</el-row>
<!-- <el-row>
<el-col :span="12">
<div class="span-sty">分公司</div>
<el-form-item><span class="addinputInfo">{{ formobj.useOrgName }}</span></el-form-item>
</el-col>
</el-row> </el-row>
<el-row>
<el-col :span="12">
<div class="span-sty">流程状态</div>
<el-form-item><span class="addinputInfo">{{ formobj.nodeState }}</span></el-form-item>
</el-col>
</el-row> -->
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="span-sty">附件</div> <div class="span-sty">附件</div>
<el-form-item class="trightb_item"> <el-form-item class="trightb_item">
<el-image style="width: 120px;height: 120px; margin: 10px;" class="addinputInfo" <el-image style="width: 120px;height: 120px; margin: 10px;" class="addinputInfo" v-for="(item, index) in formobj.filePaths" :key="index" :src="item" :preview-src-list="[item]">
v-for="(item,index) in formobj.filePaths" :src="item" :preview-src-list="[item]">
</el-image> </el-image>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="span-sty">备注</div> <div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<div class="title">已返厂旧件列表</div>
<div class="title" <el-table v-loading="listLoading" :data="formobj.asOldpartreturnConfirmDetailDetailsList" border style="width: 100%;" :row-style="{height: '40px'}">
style="display: flex;align-items: center;justify-content: space-between;height:40px;margin-top: 10px;">
<div>已返厂旧件列表</div>
</div>
<el-table v-loading="listLoading" :data="formobj.asOldpartreturnConfirmDetailDetailsList" border
style="width: 100%;" :row-style="{height: '40px'}">
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/> <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="商品名称" prop="goodsSpuName" align="center"/> <el-table-column label="商品名称" prop="goodsSpuName" align="center"/>
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" /> <el-table-column label="图号" prop="goodsSkuCode" align="center"/>
<el-table-column label="厂家" prop="manufacturerName" align="center"/> <el-table-column label="厂家" prop="manufacturerName" align="center"/>
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center"/> <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center"/>
<el-table-column label="单位" prop="unit" align="center"/> <el-table-column label="单位" prop="unit" align="center"/>
@ -98,10 +54,7 @@
<el-table-column label="确认数量" prop="confirmCount" align="center"/> <el-table-column label="确认数量" prop="confirmCount" align="center"/>
</el-table> </el-table>
</el-form> </el-form>
</div> </div>
</div> </div>
</template> </template>
@ -114,34 +67,23 @@
return { return {
listLoading: false, listLoading: false,
submitdisabled: false, submitdisabled: false,
formobj: {}, formobj: {}
} }
}, },
methods: { methods: {
indexMethod(index) { indexMethod(index) {
return index + 1 return index + 1
}, },
handleReturn() {
handleReturn(isreload) { this.formobj = {}
if (isreload === 'true') this.$emit('reloadlist')
this.$emit('doback') this.$emit('doback')
}, },
showAdd() {
},
showEdit(row) { showEdit(row) {
req.init(row.sid).then(resp => {
var params = {
sid: row.sid
}
req.init(row.sid)
.then(resp => {
if (resp.success) { if (resp.success) {
this.formobj = resp.data this.formobj = resp.data
} }
}) }).catch(e => {
.catch(e => {
this.formobj = {} this.formobj = {}
}) })
} }
@ -157,20 +99,7 @@
margin-left: 120px !important; margin-left: 120px !important;
} }
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important;
width: calc(100% - 115px);
}
.first_row { .first_row {
border-top: 1px solid #E0E3EB; border-top: 1px solid #E0E3EB;
} }
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
</style> </style>

Write Preview
Loading…
Cancel
Save