Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
God 11 months ago
parent
commit
70bbc53139
  1. 12
      yxt-as-ui/src/views/maintenance/maintenanceOutbound/index.vue
  2. 12
      yxt-as-ui/src/views/maintenance/maintenanceReturnBound/index.vue
  3. 14
      yxt-as-ui/src/views/storage/inventory/inventoryRefer.vue
  4. 26
      yxt-as-ui/src/views/storage/oldPartsCope/index.vue
  5. 203
      yxt-as-ui/src/views/storage/oldPartsCope/oldPartsCopeAdd.vue
  6. 12
      yxt-as-ui/src/views/storage/oldPartsCope/oldPartsCopeInfo.vue

12
yxt-as-ui/src/views/maintenance/maintenanceOutbound/index.vue

@ -9,7 +9,7 @@
<div>
<el-button type="primary" size="small" @click="seleMaintenance">选择维修工单</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>
<!-- end 添加修改按钮 -->
<!-- end 详情按钮 -->
@ -24,21 +24,21 @@
<el-row class="first_row">
<el-col :span="8">
<div class="span-sty"><span class="must">*</span> 制单</div>
<div class="span-sty"><span class="must">*</span> 操作</div>
<el-form-item prop="createByName">
<span class="addinputw addinputInfo">{{formobj.createByName}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty"><span class="must">*</span> 制单部门</div>
<div class="span-sty"><span class="must">*</span> 操作部门</div>
<el-form-item prop="deptName">
<span class="addinputw addinputInfo">{{formobj.deptName}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">制单日期</div>
<div class="span-sty">操作日期</div>
<el-form-item prop="createByName">
<el-form-item><span class="addinputw addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-form-item>
@ -113,9 +113,9 @@
</el-col>
<el-col :span="8">
<div class="span-sty"></div>
<div class="span-sty">是否外出</div>
<el-form-item>
<el-form-item><span class="addinputw addinputInfo"></span></el-form-item>
<el-form-item><span class="addinputw addinputInfo">{{formobj.subject}}</span></el-form-item>
</el-form-item>
</el-col>
</el-row>

12
yxt-as-ui/src/views/maintenance/maintenanceReturnBound/index.vue

@ -9,7 +9,7 @@
<div>
<el-button type="primary" size="small" @click="seleMaintenance">选择维修工单</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>
<!-- end 添加修改按钮 -->
<!-- end 详情按钮 -->
@ -24,21 +24,21 @@
<el-row class="first_row">
<el-col :span="8">
<div class="span-sty"><span class="must">*</span> 制单</div>
<div class="span-sty"><span class="must">*</span> 操作</div>
<el-form-item prop="createByName">
<span class="addinputw addinputInfo">{{formobj.createByName}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty"><span class="must">*</span> 制单部门</div>
<div class="span-sty"><span class="must">*</span> 操作部门</div>
<el-form-item prop="deptName">
<span class="addinputw addinputInfo">{{formobj.deptName}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">制单日期</div>
<div class="span-sty">操作日期</div>
<el-form-item prop="createByName">
<el-form-item><span class="addinputw addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-form-item>
@ -113,9 +113,9 @@
</el-col>
<el-col :span="8">
<div class="span-sty"></div>
<div class="span-sty">是否外出</div>
<el-form-item>
<el-form-item><span class="addinputw addinputInfo"></span></el-form-item>
<el-form-item><span class="addinputw addinputInfo">{{formobj.subject}}</span></el-form-item>
</el-form-item>
</el-col>
</el-row>

14
yxt-as-ui/src/views/storage/inventory/inventoryRefer.vue

@ -21,12 +21,15 @@
<el-form-item label="仓库">
<el-input v-model="listQuery.params.warehouseName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="库区">
<el-input v-model="listQuery.params.warehouseName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="库位">
<el-input v-model="listQuery.params.warehouseRackCode" placeholder="" clearable/>
</el-form-item>
<el-form-item label="批次号">
<!-- <el-form-item label="批次号">
<el-input v-model="listQuery.params.batchNumber" placeholder="" clearable/>
</el-form-item>
</el-form-item> -->
<el-form-item label="来源单号">
<el-input v-model="listQuery.params.billNo" placeholder="" clearable/>
</el-form-item>
@ -63,6 +66,7 @@
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="100" />
<el-table-column prop="unit" label="单位" align="center" width="80" />
<el-table-column prop="warehouseName" label="仓库" min-width="100" />
<el-table-column prop="warehouseRackCode" label="库区" width="100" />
<el-table-column prop="warehouseRackCode" label="库位" width="100" />
<el-table-column prop="billNo" label="来源单号" align="center" width="100" />
<el-table-column prop="createTime" label="发生时间" align="center" width="120" />
@ -70,8 +74,10 @@
<el-table-column prop="busTypeValue" label="业务类型" align="center" width="100" />
<el-table-column prop="billObjName" label="客户/供应商" align="center" width="150" />
<el-table-column prop="batchNumber" label="批次号" align="center" width="100" />
<el-table-column prop="count" label="数量" align="center" width="140" />
<el-table-column prop="currentCount" label="出入库后的库存" width="80" />
<el-table-column prop="count" label="数量" align="center" width="100" />
<el-table-column prop="currentCount" label="出入库后的库存" width="140" />
<el-table-column prop="currentCount" label="操作人" width="100" />
<el-table-column prop="currentCount" label="经办人" width="100" />
</el-table>
</div>
<!--End 主页面主要部分-->

26
yxt-as-ui/src/views/storage/oldPartsCope/index.vue

@ -64,15 +64,15 @@
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column fixed label="操作" align="center" width="180">
<template slot-scope="scope">
<el-button type="primary" size="mini" :disabled="scope.row.billState=='完成'"
<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>
</template>
</el-table-column>
<el-table-column prop="nodeState" label="流程状态" align="center" />
<el-table-column prop="billNo" label="单据编号" align="center" />
<el-table-column prop="billNo" label="单据编号 "width="180" align="center" />
<el-table-column prop="useOrgName" label="分公司" align="center" />
<el-table-column prop="createDeptName" label="申请部门" align="center" />
<el-table-column prop="deptName" label="申请部门" align="center" />
<el-table-column prop="createByName" label="申请人" align="center" />
<el-table-column prop="createTime" label="申请日期" align="center" />
<el-table-column prop="finishTime" label="办结日期" align="center" />
@ -159,12 +159,12 @@
sids: [],
selectionList: [],
billStateList: [{
name: "新建",
sid: "0"
name: '处理方式1',
sid: "1"
},
{
name: "完成",
sid: "1"
name: '处理方式2',
sid: "2"
}
],
}
@ -252,6 +252,18 @@
},
doDel() {
for (var i = 0; i < this.selectionList.length; i++) {
if(this.selectionList[i].nodeState!='待提交'){
this.$message({
type: 'warning',
message: '请勿勾选已提交的。',
showClose: true
})
return
}
}
if (this.sids.length > 0) {
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
this.$confirm(tip, '提示', {

203
yxt-as-ui/src/views/storage/oldPartsCope/oldPartsCopeAdd.vue

@ -13,7 +13,7 @@
<!-- end 详情按钮 -->
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<div class="title">
<div>基础信息</div>
</div>
@ -25,7 +25,7 @@
</el-col>
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.createDeptName }}</span></el-form-item>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<!-- <el-col :span="12">
@ -33,8 +33,8 @@
<el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
</el-col> -->
<el-col :span="8">
<div class="span-sty">申请日期</div>
<el-form-item>
<div class="span-sty"><span class="must">*</span> 申请日期</div>
<el-form-item prop="createTime">
<el-date-picker v-model="formobj.createTime" class="addinputw addinputInfo" type="date"
value-format="yyyy-MM-dd" placeholder="选择日期">
</el-date-picker>
@ -46,20 +46,22 @@
<el-row>
<el-col :span="8">
<div class="span-sty">处理原因</div>
<el-form-item>
<el-select v-model="formobj.handleReasonValue" placeholder="请选择" class="addinputw addinputInfo">
<el-option v-for="(item,i) in handleReasonList" :key="i" :label="item.name" :value="item.sid">
<div class="span-sty"><span class="must">*</span> 处理原因</div>
<el-form-item prop="handleReasonValue">
<el-select v-model="formobj.handleReasonValue" placeholder="请选择" class="addinputw addinputInfo" @change="selectHandleReason">
<el-option v-for="(item,i) in handleReasonList" :key="i" :label="item.name" :value="item.sid"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">处理方式</div>
<el-form-item>
<el-select v-model="formobj.handleModeValue" placeholder="请选择" class="addinputw addinputInfo">
<el-option v-for="(item,i) in handleModeList" :key="i" :label="item.name" :value="item.sid">
<div class="span-sty"><span class="must">*</span> 处理方式</div>
<el-form-item prop="handleModeValue">
<el-select v-model="formobj.handleModeValue" placeholder="请选择" class="addinputw addinputInfo" @change="selectHandleMode">
<el-option v-for="(item,i) in handleModeList" :key="i" :label="item.name" :value="item.sid"
>
</el-option>
</el-select>
</el-form-item>
@ -83,10 +85,10 @@
<el-row>
<el-col :span="24">
<div class="span-sty">附件</div>
<el-form-item>
<upload-img ref="uploadImg" class="addinputw" v-model="formobj.filePaths" :limit="50" bucket="map"
:upload-data="{ type: '0001' }" />
<div class="span-sty"><span class="must">*</span> 附件</div>
<el-form-item prop="imgList">
<upload-img ref="uploadImg" class="addinputw" v-model="imgList" :limit="50" bucket="map"
:upload-data="{ type: '0001' }" @change="backData" />
</el-form-item>
</el-col>
@ -101,7 +103,7 @@
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column fixed label="操作" align="center" width="100">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">删除</el-button>
<el-button type="primary" size="mini" @click="deleteAsOldparthandle(scope.row)">删除</el-button>
</template>
</el-table-column>
@ -130,12 +132,12 @@
</el-popover>
</template>
</el-table-column> -->
<el-table-column prop="vinNo" label="车架号" align="center" />
<!-- <el-table-column prop="vinNo" label="车架号" align="center" /> -->
<el-table-column prop="goodsSkuId" label="商品ID" align="center" />
<el-table-column prop="goodsSkuName" label="商品名称" align="center" />
<el-table-column prop="goodsSkuCode" label="商品编码" align="center" />
<el-table-column prop="manufacturerName" label="厂家" align="center" />
<el-table-column prop="unit" label="供应商" align="center" />
<!-- <el-table-column prop="supplierName" label="厂家" align="center" /> -->
<el-table-column prop="supplierName" label="供应商" align="center" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" />
<el-table-column prop="unit" label="单位" align="center" />
<el-table-column prop="warehouseName" label="仓库" align="center" />
@ -165,7 +167,7 @@
<el-input v-model="queryParams.params.warehouseName" placeholder="" clearable />
</el-form-item>
<el-form-item label="库位">
<el-input v-model="queryParams.params.areaName" placeholder="" clearable />
<el-input v-model="queryParams.params.warehouseRackCode" placeholder="" clearable />
</el-form-item>
<el-form-item label="供应商">
<el-input v-model="queryParams.params.supplierName" placeholder="" clearable />
@ -181,12 +183,12 @@
@selection-change="selectionLineChangeHandle">
<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 prop="goodsID" label="商品ID" align="center" />
<el-table-column prop="goodsID" label="商品ID" width="150" align="center" />
<el-table-column prop="goodsSpuName" label="商品名称" width="120" align="center" />
<el-table-column prop="goodsSkuCode" label="商品编码" width="100" align="center" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" width="100" align="center" />
<el-table-column prop="unit" label="单位" width="100" align="center" />
<el-table-column prop="warehouseName" label="仓库" width="120" align="center" />
<el-table-column prop="warehouseName" label="仓库" width="150" align="center" />
<el-table-column prop="warehouseRackCode" label="库位" width="120" align="center" />
<el-table-column prop="supplierName" label="供应商" width="120" align="center" />
<el-table-column prop="count" label="库存数量" width="100" align="center" />
@ -213,6 +215,10 @@
<script>
import req from '@/api/storage/oldPartsCope.js'
import uploadImg from '@/components/uploadFile/uploadImg'
import {
getOrgSidByPath
} from '@/api/Common/dictcommons'
export default {
components: {
uploadImg
@ -231,21 +237,20 @@
"remarks": "",
"createBySid": window.sessionStorage.getItem('userSid'),
"createByName": window.sessionStorage.getItem('name'),
"createDeptSid": window.sessionStorage.getItem('departmentSid'),
"createDeptName": window.sessionStorage.getItem('departmentName'),
"deptSid": window.sessionStorage.getItem('departmentSid'),
"deptName": window.sessionStorage.getItem('departmentName'),
"createTime": "",
"billNo": "",
"filePaths": [],
"useOrgSid": window.sessionStorage.getItem('orgSid'),
"useOrgName": window.sessionStorage.getItem('Orgname'),
"orgSidPath": window.sessionStorage.getItem('orgSidPath'),
"useOrgSid": '',
"useOrgName": '',
"procDefId": "",
"nodeId": "",
"procInstId": "",
"nodeState": "",
"taskId": "",
"finishTime": "",
"asOldpartreturnList": [
"asOldparthandleList": [
]
},
@ -294,16 +299,63 @@
"goodsName": "",
"goodsSkuCode": "",
"warehouseName": "",
"areaName": "",
"warehouseRackCode": "",
"supplierName": "",
}
},
dataList: []
dataList: [],
rules: {
createTime: [{
required: true,
message: '申请日期不能为空',
trigger: 'change'
}],
handleReasonValue: [{
required: true,
message: '处理原因不能为空',
trigger: 'change'
}],
handleModeValue: [{
required: true,
message: '处理方式不能为空',
trigger: 'change'
}],
filePaths: [{
required: true,
message: '附件不能为空',
trigger: 'blur'
}],
}
}
},
created() {},
created() {
getOrgSidByPath({
orgPath: window.sessionStorage.getItem('defaultOrgPath')
}).then((res) => {
if (res.success) {
this.formobj.createOrgSid = res.data
this.formobj.useOrgSid = res.data
}
})
},
methods: {
selectHandleReason(val) {
console.log('>>>>>>>>>selectHandleReason', val)
const choose = this.handleReasonList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectHandleReason', choose)
this.formobj.handleReasonValue = choose[0].name
this.formobj.handleReasonKey = choose[0].sid
},
selectHandleMode(val) {
const choose = this.handleModeList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectHandleMode', choose)
this.formobj.handleModeValue = choose[0].name
this.formobj.handleModeKey = choose[0].sid
},
indexMethod(index) {
return Number(index) + 1
},
@ -320,7 +372,7 @@
"goodsName": "",
"goodsSkuCode": "",
"warehouseName": "",
"areaName": "",
"warehouseRackCode": "",
"supplierName": "",
}
}
@ -329,6 +381,9 @@
importDetail() {
this.tableLoading = true
this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.queryParams.params.menuUrl = this.$route.path
req.handleGoodsListPage(this.queryParams).then((resp) => {
this.tableLoading = false
this.dialogVisible = true
@ -351,13 +406,40 @@
},
addDialogList() {
for (var i = 0; i < this.selectionList.length; i++) {
this.formobj.asOldpartreturnList.push(this.selectionList[i])
var item = {
count: this.selectionList[i].count,
goodsSkuCode: this.selectionList[i].goodsSkuCode,
goodsSkuId: this.selectionList[i].goodsID,
goodsSkuName: this.selectionList[i].goodsSpuName,
goodsSkuOwnSpec: this.selectionList[i].goodsSkuOwnSpec,
mainSid: '',
sid: '',
supplierName: this.selectionList[i].supplierName,
unit: this.selectionList[i].unit,
vinNo: '',
warehouseName: this.selectionList[i].warehouseName,
warehouseRackCode: this.selectionList[i].warehouseRackCode,
warehouseRackSid: this.selectionList[i].warehouseRackSid,
warehouseSid: this.selectionList[i].warehouseSid,
}
this.formobj.asOldparthandleList.push(item)
}
this.dialogVisible = false
},
handleClose() {
this.dialogVisible = false
},
deleteAsOldparthandle(row) {
const index = this.formobj.asOldparthandleList.findIndex((item) => item === row)
console.log("index》》》》", index)
this.formobj.asOldparthandleList.splice(index, 1)
},
saveOrUpdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
@ -383,33 +465,6 @@
},
submit() {
if (this.formobj.createTime == '') {
this.$message({
showClose: true,
type: 'warning',
message: '申请日期不能为空'
})
return
}
if (this.formobj.handleModeKey == '' ||
this.formobj.handleReasonValue == '') {
this.$message({
showClose: true,
type: 'warning',
message: '处理方式不能为空'
})
return
}
if (this.formobj.handleReasonKey == '' || this.formobj.handleReasonValue == '') {
this.$message({
showClose: true,
type: 'warning',
message: '处理原因不能为空'
})
return
}
if (this.formobj.asOldparthandleList.length == 0) {
this.$message({
@ -474,7 +529,7 @@
"nodeState": "",
"taskId": "",
"finishTime": "",
"asOldpartreturnList": []
"asOldparthandleList": []
}
this.submitdisabled = false
this.isUpdata = false
@ -484,15 +539,21 @@
showAdd() {
this.title = "【新增】"
this.isUpdata = false
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
},
showEdit(row) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.title = "【修改】"
this.isUpdata = true
var params = {
sid: row.sid
}
req.init(params)
req.init(row.sid)
.then(resp => {
if (resp.success) {
this.formobj = resp.data
@ -510,16 +571,28 @@
})
},
backData() {
backData(value) {
console.log('backData》》》》', value)
console.log('imgList', this.imgList)
this.formobj.filePaths = this.imgList
for (var i = 0; i < this.imgList.length; i++) {
this.formobj.filePaths.push(this.imgList[i].url)
}
}
}
}
</script>
<style scoped>
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.must {
color: #f00;
}
.span-sty {
width: 130px !important;
}

12
yxt-as-ui/src/views/storage/oldPartsCope/oldPartsCopeInfo.vue

@ -23,7 +23,7 @@
</el-col>
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.createDeptName }}</span></el-form-item>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
@ -67,7 +67,7 @@
<div class="span-sty">附件</div>
<el-form-item class="trightb_item">
<el-image style="width: 120px;height: 120px; margin: 10px;" class="addinputInfo"
v-for="(item,index) in formobj.filePaths" :src="item.url" :preview-src-list="[item.url]">
v-for="(item,index) in formobj.filePaths" :src="item" :preview-src-list="[item]">
</el-image>
</el-form-item>
</el-col>
@ -79,7 +79,7 @@
</div>
<el-table v-loading="listLoading" :data="formobj.asOldparthandleList" border>
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column prop="vinNo" label="车架号" align="center" />
<!-- <el-table-column prop="vinNo" label="车架号" align="center" /> -->
<el-table-column prop="goodsSkuId" label="商品ID" align="center" />
<el-table-column prop="goodsSkuName" label="商品名称" align="center" />
<el-table-column prop="goodsSkuCode" label="商品编码" align="center" />
@ -125,7 +125,7 @@
"nodeState": "",
"taskId": "",
"finishTime": "",
"asOldpartreturnList": [
"asOldparthandleList": [
]
},
@ -177,7 +177,7 @@
"nodeState": "",
"taskId": "",
"finishTime": "",
"asOldpartreturnList": []
"asOldparthandleList": []
}
this.$emit('doback')
},
@ -188,7 +188,7 @@
sid: row.sid
}
req.init(params)
req.init(row.sid)
.then(resp => {
if (resp.success) {
this.formobj = resp.data

Loading…
Cancel
Save