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

Merge remote-tracking branch 'origin/master'

master
yunuo970428 9 months ago
parent
2ebc3f9131 138d600f31
commit
8445a5da53
4 changed files with 345 additions and 238 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      yxt-as-ui/src/views/maintenanceReceive/maintenanceOutbound.vue
  2. 199
      yxt-as-ui/src/views/maintenanceReceive/maintenanceReturnBound.vue
  3. 35
      yxt-as-ui/src/views/maintenanceReceive/repairbillInfo.vue
  4. 346
      yxt-as-ui/src/views/storage/stocktaking/index.vue

3
yxt-as-ui/src/views/maintenanceReceive/maintenanceOutbound.vue
View File

@ -492,8 +492,7 @@
this.$refs['form_obj'].validate((valid) => {
if (valid) {
req.saveBill(this.formobj)
req.saveOutBill(this.formobj)
.then(resp => {
if (resp.success) {
this.$message({

199
yxt-as-ui/src/views/maintenanceReceive/maintenanceReturnBound.vue
View File

@ -26,14 +26,14 @@
<el-col :span="8">
<div class="span-sty"><span class="must">*</span> 申请人</div>
<el-form-item prop="createByName">
<span class="addinputw addinputInfo">{{formobj.createByName}}</span>
<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>
<el-form-item prop="deptName">
<span class="addinputw addinputInfo">{{formobj.deptName}}</span>
<span class="addinputw addinputInfo">{{ formobj.deptName }}</span>
</el-form-item>
</el-col>
@ -51,10 +51,15 @@
<el-col :span="8">
<div class="span-sty"><span class="must">*</span> 退料人</div>
<el-form-item prop="warehouseManager">
<el-select v-model="formobj.warehouseManager" filterable clearable placeholder="请选择"
class="addinputw addinputInfo" @change="receivePerSelect">
<el-option v-for="item in receivePerList" :key="item.sid" :label="item.name" :value="item.sid">
</el-option>
<el-select
v-model="formobj.warehouseManager"
filterable
clearable
placeholder="请选择"
class="addinputw addinputInfo"
@change="receivePerSelect"
>
<el-option v-for="item in receivePerList" :key="item.sid" :label="item.name" :value="item.sid" />
</el-select>
</el-form-item>
@ -77,14 +82,14 @@
<el-col :span="8">
<div class="span-sty">维修工单编号</div>
<el-form-item>
<span class="addinputw addinputInfo">{{formobj.sourceBillNo}}</span>
<span class="addinputw addinputInfo">{{ formobj.sourceBillNo }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">单据日期</div>
<el-form-item>
<span class="addinputw addinputInfo">{{formobj.billDate}}</span>
<span class="addinputw addinputInfo">{{ formobj.billDate }}</span>
</el-form-item>
</el-col>
@ -101,21 +106,21 @@
<el-col :span="8">
<div class="span-sty">工单类型</div>
<el-form-item>
<span class="addinputw addinputInfo">{{formobj.billType}}</span>
<span class="addinputw addinputInfo">{{ formobj.billType }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">科目</div>
<el-form-item>
<span class="addinputw addinputInfo">{{formobj.subject}}</span>
<span class="addinputw addinputInfo">{{ formobj.subject }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">是否外出</div>
<el-form-item>
<el-radio-group class="addinputw addinputInfo" :disabled="true" v-model="formobj.isGoOut">
<el-radio-group v-model="formobj.isGoOut" class="addinputw addinputInfo" :disabled="true">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
@ -129,14 +134,14 @@
<el-col :span="8">
<div class="span-sty">客户名称</div>
<el-form-item>
<span class="addinputw addinputInfo">{{formobj.customerName}}</span>
<span class="addinputw addinputInfo">{{ formobj.customerName }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">车牌号/车架号</div>
<el-form-item>
<span class="addinputw addinputInfo">{{formobj.vehMark}}/{{formobj.vinNo}}</span>
<span class="addinputw addinputInfo">{{ formobj.vehMark }}/{{ formobj.vinNo }}</span>
</el-form-item>
</el-col>
@ -185,20 +190,27 @@
-->
<el-table-column label="仓库" align="center" width="180">
<template slot-scope="scope">
<el-select v-model="scope.row.warehouseName" placeholder="请选择" clearable
@change="selectWarehouseName(scope.row,$event)">
<el-option v-for="(item,i) in warehouseList" :key="i" :label="item.warehouseName" :value="item.sid">
</el-option>
<el-select
v-model="scope.row.warehouseName"
placeholder="请选择"
clearable
@change="selectWarehouseName(scope.row,$event)"
>
<el-option v-for="(item,i) in warehouseList" :key="i" :label="item.warehouseName" :value="item.sid" />
</el-select>
</template>
</el-table-column>
<el-table-column label="库位" align="center" width="180">
<template slot-scope="scope">
<el-select v-model="scope.row.warehouseRackCode" :disabled="scope.row.warehouseName==''" clearable
@focus="getWarehouseAreaList(scope.row.warehouseSid)" placeholder="请选择"
@change="selectWarehouseAreaCode(scope.row,$event)">
<el-option v-for="(item,i) in warehouseRackList" :key="i" :label="item.areaCode" :value="item.sid">
</el-option>
<el-select
v-model="scope.row.warehouseRackCode"
:disabled="scope.row.warehouseName==''"
clearable
placeholder="请选择"
@focus="getWarehouseAreaList(scope.row.warehouseSid)"
@change="selectWarehouseAreaCode(scope.row,$event)"
>
<el-option v-for="(item,i) in warehouseRackList" :key="i" :label="item.areaCode" :value="item.sid" />
</el-select>
</template>
</el-table-column>
@ -206,8 +218,12 @@
<el-table-column label="已出数量" prop="outboundCount" align="center" />
<el-table-column label="退库数量" align="center" width="120">
<template slot-scope="scope">
<el-input v-model="scope.row.count" clearable placeholder=""
oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
<el-input
v-model="scope.row.count"
clearable
placeholder=""
oninput="value=value.replace(/^(0+)|[^\d]+/g,'')"
/>
</template>
</el-table-column>
<el-table-column label="销售单价" prop="price" align="center" />
@ -242,7 +258,7 @@
} from '@/utils/index.js'
export default {
components: {
chooseproducts,
chooseproducts
},
data() {
return {
@ -251,33 +267,33 @@
submitdisabled: false,
formobj: {
"sid": "",
"createBySid": window.sessionStorage.getItem('userSid'),
"createByName": window.sessionStorage.getItem('name'),
"sourceBillSid": "",
"warehouseManagerSid": "",
"warehouseManager": "",
"useOrgSid": "",
"createOrgSid": "",
"deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
'sid': '',
'createBySid': window.sessionStorage.getItem('userSid'),
'createByName': window.sessionStorage.getItem('name'),
'sourceBillSid': '',
'warehouseManagerSid': '',
'warehouseManager': '',
'useOrgSid': '',
'createOrgSid': '',
'deptSid': window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1),
"deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
'deptName': window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
"createTime": getCurrentDate(),
"remarks": "",
"sourceBillNo": "",
"waitorName": "",
"billDate": "",
"billType": "",
"subject": "",
"customerName": "",
"vehMark": "",
"vinNo": "",
"customerOrg": "",
"sitemVoList": [
'createTime': getCurrentDate(),
'remarks': '',
'sourceBillNo': '',
'waitorName': '',
'billDate': '',
'billType': '',
'subject': '',
'customerName': '',
'vehMark': '',
'vinNo': '',
'customerOrg': '',
'sitemVoList': [
],
"detailList": [
'detailList': [
]
},
@ -304,7 +320,7 @@
required: true,
message: '请选择领料人',
trigger: 'change'
}],
}]
}
}
@ -318,12 +334,9 @@
if (res.success) {
this.receivePerList = res.data
console.log("aaaaaa", this.receivePerList);
console.log('aaaaaa', this.receivePerList)
}
})
},
showAdd(sid) {
@ -351,7 +364,6 @@
this.formobj.createByName = window.sessionStorage.getItem('name')
this.formobj.createTime = getCurrentDate()
getOrgSidByPath({
orgPath: window.sessionStorage.getItem('defaultOrgPath')
}).then((res) => {
@ -360,14 +372,11 @@
this.formobj.useOrgSid = res.data
}
})
} else {
// 根据resp.code进行异常情况处理
}
})
.catch(() => {})
},
backData(value) {
this.viewState = 1
@ -390,7 +399,6 @@
this.formobj.createByName = window.sessionStorage.getItem('name')
this.formobj.createTime = getCurrentDate()
getOrgSidByPath({
orgPath: window.sessionStorage.getItem('defaultOrgPath')
}).then((res) => {
@ -399,14 +407,11 @@
this.formobj.useOrgSid = res.data
}
})
} else {
// 根据resp.code进行异常情况处理
}
})
.catch(() => {})
},
resetState() {
this.viewState = 1
@ -422,8 +427,7 @@
this.$refs['form_obj'].validate((valid) => {
if (valid) {
req.saveBill(this.formobj)
req.saveQuitBill(this.formobj)
.then(resp => {
if (resp.success) {
this.$message({
@ -437,40 +441,39 @@
}
})
.catch(() => {})
}
})
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
"sid": "",
"createBySid": window.sessionStorage.getItem('userSid'),
"createByName": window.sessionStorage.getItem('name'),
"sourceBillSid": "",
"warehouseManagerSid": "",
"warehouseManager": "",
"useOrgSid": "",
"createOrgSid": "",
"deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem(
'sid': '',
'createBySid': window.sessionStorage.getItem('userSid'),
'createByName': window.sessionStorage.getItem('name'),
'sourceBillSid': '',
'warehouseManagerSid': '',
'warehouseManager': '',
'useOrgSid': '',
'createOrgSid': '',
'deptSid': window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem(
'defaultOrgPath').lastIndexOf('/') + 1),
"deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem(
'deptName': window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem(
'defaultOrgPathName').lastIndexOf('/') + 1),
"createTime": getCurrentDate(),
"remarks": "",
"sourceBillNo": "",
"waitorName": "",
"billDate": "",
"billType": "",
"subject": "",
"customerName": "",
"vehMark": "",
"vinNo": "",
"customerOrg": "",
"sitemVoList": [
'createTime': getCurrentDate(),
'remarks': '',
'sourceBillNo': '',
'waitorName': '',
'billDate': '',
'billType': '',
'subject': '',
'customerName': '',
'vehMark': '',
'vinNo': '',
'customerOrg': '',
'sitemVoList': [
],
"detailList": [
'detailList': [
]
}
@ -488,18 +491,17 @@
},
getWarehouseList() {
console.log("getWarehouseList>>>>>>>>>>>>>");
console.log('getWarehouseList>>>>>>>>>>>>>')
var parpams = {
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
orgPath: window.sessionStorage.getItem('defaultOrgPath')
}
console.log("getWarehouseList", parpams);
console.log('getWarehouseList', parpams)
req2.getWarehouses(parpams).then((res) => {
if (res.success) {
this.warehouseList = res.data
console.log("aaaaaa", this.warehouseList);
console.log('aaaaaa', this.warehouseList)
}
})
},
@ -511,14 +513,13 @@
if (res.success) {
this.warehouseRackList = res.data
console.log("bbbbb", this.warehouseRackList);
console.log('bbbbb', this.warehouseRackList)
}
})
},
selectWarehouseName(row, val) {
console.log("selectWarehouseName", row);
console.log("selectWarehouseName", val);
console.log('selectWarehouseName', row)
console.log('selectWarehouseName', val)
const choose = this.warehouseList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectWarehouseName', choose)
row.warehouseName = choose[0].warehouseName
@ -526,27 +527,23 @@
row.warehouseRackCode = ''
row.warehouseRackSid = ''
},
selectWarehouseAreaCode(row, val) {
console.log("selectWarehouseAreaCode", val);
console.log('selectWarehouseAreaCode', val)
const choose = this.warehouseRackList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectWarehouseAreaCode', choose)
row.warehouseRackCode = choose[0].areaCode
row.warehouseRackSid = choose[0].sid
},
returnAll() {
for (var i = 0; i < this.formobj.detailList.length; i++) {
var item = this.formobj.detailList[i]
item.count = item.outboundCount
}
}
}
}
</script>

35
yxt-as-ui/src/views/maintenanceReceive/repairbillInfo.vue
View File

@ -4,7 +4,6 @@
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="primary" size="small" @click="negativeSettlement()">反结算</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
@ -78,7 +77,8 @@
<el-col :span="8">
<div class="span-sty">特殊标注</div>
<el-form-item><span
class="addinputInfo">{{ formobj.isSpecialSign == '1' ? '有' : '否' }}</span></el-form-item>
class="addinputInfo"
>{{ formobj.isSpecialSign == '1' ? '有' : '否' }}</span></el-form-item>
</el-col>
</el-row>
<el-collapse v-model="activeNames">
@ -143,21 +143,29 @@
<el-col :span="8">
<div class="span-sty">责任划分</div>
<el-form-item><span
class="addinputInfo">{{ formobj.insuranceVo.responsibility }}</span></el-form-item>
class="addinputInfo"
>{{ formobj.insuranceVo.responsibility }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">责任比例</div>
<el-form-item><span
class="addinputInfo">{{ formobj.insuranceVo.responsibilityRatio }}</span></el-form-item>
class="addinputInfo"
>{{ formobj.insuranceVo.responsibilityRatio }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">是否存在人伤</div>
<el-form-item><span
class="addinputInfo">{{ formobj.insuranceVo.isPersonInjuries == '1' ? '是' : formobj.insuranceVo.isPersonInjuries == '0' ? '否' : '' }}</span></el-form-item>
class="addinputInfo"
>{{ formobj.insuranceVo.isPersonInjuries == '1' ? '是' : formobj.insuranceVo.isPersonInjuries == '0' ? '否' : '' }}</span></el-form-item>
</el-col>
</el-row>
<el-table :key="insuranceKey" :data="formobj.insuranceVo.insuranceList" :index="index" border
style="width: 100%">
<el-table
:key="insuranceKey"
:data="formobj.insuranceVo.insuranceList"
:index="index"
border
style="width: 100%"
>
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column prop="useInsurer" label="使用保险方" align="center" min-width="150" />
<el-table-column prop="insuranceType" label="使用险种" align="center" min-width="150" />
@ -172,7 +180,8 @@
<el-col :span="8">
<div class="span-sty">是否开发票</div>
<el-form-item><span
class="addinputInfo">{{ formobj.invoiceVo.isInvoicing == '1' ? '是' : formobj.invoiceVo.isInvoicing == '0' ? '否' : '' }}</span></el-form-item>
class="addinputInfo"
>{{ formobj.invoiceVo.isInvoicing == '1' ? '是' : formobj.invoiceVo.isInvoicing == '0' ? '否' : '' }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">发票类型</div>
@ -253,7 +262,7 @@
<el-form-item><span class="addinputInfo">{{ formobj.rescueRemarks }}</span></el-form-item>
</el-col>
<el-col :span="8">
<span></span>
<span />
</el-col>
</el-row>
<el-table :key="subjoinKey" :data="formobj.aitemVos" :index="index" border style="width: 100%">
@ -266,14 +275,14 @@
<el-col :span="24">
<div class="span-sty" style="border-right: 0px">应收合计：</div>
<el-form-item><span class="addinputInfo">{{ ysTotal }} = 工时费：{{ gsfTotal }} + 材料费：{{ clfTotal }} +
附加费：{{ fjfTotal }} + 税额：0</span></el-form-item>
附加费：{{ fjfTotal }} + 税额：0</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty" style="border-right: 0px">实收合计：</div>
<el-form-item><span class="addinputInfo">{{ ssTotal }} = 应收合计：{{ ysTotal }} -
优惠：{{ yhTotal }}</span></el-form-item>
优惠：{{ yhTotal }}</span></el-form-item>
</el-col>
</el-row>
</el-form>
@ -439,8 +448,8 @@
fjfTotal() {
let fjf = '0'
fjf = parseFloat(this.formobj.outAmount !== '' ? this.formobj.outAmount : '0') + parseFloat(this.formobj
.subsidyAmount !== '' ? this.formobj.subsidyAmount : '0') + parseFloat(this.formobj.rescueAmount !== '' ?
this.formobj.rescueAmount : '0')
.subsidyAmount !== '' ? this.formobj.subsidyAmount : '0') + parseFloat(this.formobj.rescueAmount !== ''
? this.formobj.rescueAmount : '0')
if (this.formobj.aitemVos.length > 0) {
this.formobj.aitemVos.forEach((e) => {
if (e.aitemName !== '') {

346
yxt-as-ui/src/views/storage/stocktaking/index.vue
View File

@ -9,15 +9,43 @@
</el-button>
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header">
<el-form-item label="开始日期">
<el-date-picker v-model="queryParams.params.createDateStart" @change="selectTime1" type="date"
placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
<el-form-item label="部门名称">
<el-input v-model="queryParams.params.goodsSpuName" placeholder="" clearable />
</el-form-item>
<el-form-item label="结束日期">
<el-date-picker v-model="queryParams.params.createDateEnd" @change="selectTime2" type="date"
placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
<el-form-item label="盘点编号">
<el-input v-model="queryParams.params.goodsSpuName" placeholder="" clearable />
</el-form-item>
<el-form-item label="生成日期">
<el-date-picker
v-model="queryParams.params.createDateStart"
type="date"
placeholder="选择日期"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
style="width: 200px;"
@change="selectTime1"
/>
至
<el-date-picker
v-model="queryParams.params.createDateEnd"
type="date"
placeholder="选择日期"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
style="width: 200px;"
@change="selectTime2"
/>
</el-form-item>
<el-form-item label="盘库状态">
<el-select v-model="queryParams.params.reviewStatus" placeholder="请选择">
<el-option v-for="item in stocktakTypeList" :key="item" :label="item.name" :value="item.name" />
</el-select>
</el-form-item>
<el-form-item label="盘点人">
<el-input v-model="queryParams.params.goodsSpuName" placeholder="" clearable />
</el-form-item>
<el-form-item label="监盘人">
<el-input v-model="queryParams.params.goodsSpuName" placeholder="" clearable />
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
@ -33,34 +61,118 @@
<!-- End 项目列表头部 -->
<!-- Start 项目列表 -->
<div class="">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
@selection-change="selectionLineChangeHandle">
<el-table
v-loading="tableLoading"
:data="dataList"
border
style="width: 100%"
@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="billNo" label="单据编号" align="center" />
<el-table-column prop="createDate" label="单据日期" align="center" />
<el-table-column prop="createByName" label="制单人姓名" align="center" />
<el-table-column prop="checkStateName" label="盘点状态" align="center" />
<el-table-column prop="completeDate" label="完成时间" align="center" />
<el-table-column prop="createOrgName" label="门店" align="center" />
<el-table-column prop="profitCount" label="盘盈数量" align="center" />
<el-table-column prop="profitAmount" label="盘盈金额" align="center" />
<el-table-column prop="lossCount" label="盘亏数量" align="center" />
<el-table-column prop="lossAmount" label="盈亏金额" align="center" />
<el-table-column fixed label="操作" align="center" width="220">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="toRelevancy(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>
</el-table-column>
<el-table-column prop="billNo" label="流程状态" width="120" align="center" />
<el-table-column prop="billNo" label="部门" width="120" align="center" />
<el-table-column prop="billNo" label="盘点编号" width="120" align="center" />
<el-table-column prop="createDate" label="生成日期" width="120" align="center" />
<el-table-column prop="createByName" label="盘点人" width="120" align="center" />
<el-table-column prop="checkStateName" label="监盘人" width="120" align="center" />
<el-table-column prop="completeDate" label="盘库状态" width="120" align="center" />
<el-table-column label="应盘" align="center">
<el-table-column prop="completeDate" label="数量" align="center" width="100" />
<el-table-column prop="completeDate" label="金额" align="center" width="100" />
</el-table-column>
<el-table-column label="实盘" align="center">
<el-table-column prop="completeDate" label="数量" align="center" width="100" />
<el-table-column prop="completeDate" label="金额" align="center" width="100" />
</el-table-column>
<el-table-column label="未盘" align="center">
<el-table-column prop="completeDate" label="数量" align="center" width="100" />
<el-table-column prop="completeDate" label="金额" align="center" width="100" />
</el-table-column>
<el-table-column label="盘盈" align="center">
<el-table-column prop="completeDate" label="数量" align="center" width="100" />
<el-table-column prop="completeDate" label="金额" align="center" width="100" />
</el-table-column>
<el-table-column label="盘亏" align="center">
<el-table-column prop="completeDate" label="数量" align="center" width="100" />
<el-table-column prop="completeDate" label="金额" align="center" width="100" />
</el-table-column>
<el-table-column label="盘损" align="center">
<el-table-column prop="completeDate" label="数量" align="center" width="100" />
<el-table-column prop="completeDate" label="金额" align="center" width="100" />
</el-table-column>
<el-table-column prop="lossAmount" label="备注" align="center" width="200" />
</el-table>
</div>
<!-- End 项目列表 -->
<div class="pages">
<div class="tit" />
<!-- 翻页 -->
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
:limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
<pagination
v-show="dataList.length > 0"
:total="queryParams.total"
:page.sync="queryParams.current"
:limit.sync="queryParams.size"
class="pagination"
@pagination="loadList"
/>
</div>
</div>
</div>
<!-- End 查询和其列表部分 -->
<!-- 新增修改部分组件 -->
<divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
<el-dialog title="新建盘点单" :visible.sync="dialogVisible" :before-close="handleClose">
<el-form ref="dataForm" class="formaddcopy02" style="margin-top: -40px;" :model="formobj">
<el-row class="first_row">
<el-col :span="6">
<div class="span-sty">盘点人</div>
<el-form-item> <span class="addinputInfo addinputw">审核结果</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">生成日期</div>
<el-form-item> <span class="addinputInfo addinputw">审核结果</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">监盘人</div>
<el-form-item><el-select
v-model="queryParams.params.reviewStatus"
placeholder="请选择"
class="addinputInfo addinputw"
>
<el-option v-for="item in stocktakTypeList" :key="item" :label="item.name" :value="item.name" />
</el-select></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><el-input
v-model="formobj.remarks"
placeholder="请填写"
class="addinputInfo addinputw"
clearable
/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div style="display: flex;flex-direction: row;width: 100%;justify-content: center;align-items: center;">
<el-button type="primary" style="margin-top: 20px;" @click="saveExamine">保 存</el-button>
<el-button type="primary" style="margin-top: 20px;" @click="handleClose">关 闭</el-button>
</div>
</el-dialog>
</div>
</template>
@ -79,6 +191,7 @@
},
data() {
return {
dialogVisible: false,
btndisabled: false,
viewState: 1, // 1、列表 2、添加 3、修改 4、查看
isSearchShow: false,
@ -90,14 +203,21 @@
size: 'small',
icon: 'plus',
btnKey: 'toAdd',
btnLabel: '新增'
btnLabel: '生成盘点单'
},
{
type: 'primary',
size: 'small',
icon: 'edit',
btnKey: 'toEdit',
btnLabel: '盘库'
},
{
type: 'primary',
size: 'small',
icon: 'edit',
btnKey: 'toEdit',
btnLabel: '编辑'
btnLabel: '生成盘库报告'
},
{
type: 'info',
@ -112,21 +232,39 @@
size: 10,
total: 0,
params: {
"createDateStart": "",
"createDateEnd": "",
'createDateStart': '',
'createDateEnd': ''
}
},
sids: [],
selectionList: []
selectionList: [],
stocktakTypeList: [{
sid: '1',
name: '未完成'
},
{
sid: '2',
name: '已完成'
}
],
formobj: {}
}
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
created() {
this.loadList()
// this.loadList()
},
methods: {
handleClose() {
this.dialogVisible = false
},
saveExamine() {
this.dialogVisible = false
},
// 搜索条件效果
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
@ -141,9 +279,9 @@
case 'toAdd':
this.toAdd()
break
case 'toEdit':
this.toEdit()
break
case 'toEdit':
this.toEdit()
break
case 'doClose':
this.doClose()
break
@ -175,13 +313,6 @@
var pageindex = index + 1 + pagestart
return pageindex
},
selectTime1() {
},
selectTime2() {
},
dosearch() {
this.queryParams.current = 1
this.loadList()
@ -192,36 +323,37 @@
size: 10,
total: 0,
params: {
"createDateStart": "",
"createDateEnd": "",
'createDateStart': '',
'createDateEnd': ''
}
}
this.loadList()
},
toAdd() {
this.viewState = 2
this.$refs['divadd'].showAdd()
// this.viewState = 2
// this.$refs['divadd'].showAdd()
this.dialogVisible = true
},
selectionLineChangeHandle(val) {
console.log("val", val);
console.log('val', val)
this.selectionList = val
},
toEdit(){
if(this.selectionList.length!=1){
toEdit() {
if (this.selectionList.length != 1) {
this.$message({
type: 'warning',
message: "请选择一条数据。",
message: '请选择一条数据。',
showClose: true
})
return
}
if(this.selectionList[0].checkState==2){
if (this.selectionList[0].checkState == 2) {
this.$message({
type: 'warning',
message: "此记录已完成,不可重复编辑。",
message: '此记录已完成,不可重复编辑。',
showClose: true
})
return
@ -230,33 +362,6 @@
this.viewState = 3
this.$refs['divadd'].showEdit(this.selectionList[0])
},
toBuild() {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.exportExcel(this.queryParams.params).then((resp) => {
loading.close()
const blob = new Blob([resp], {
type: 'application/vnd.ms-excel'
})
const fileName = '出入库明细_' + this.queryParams.params.createDateStart + '.xls'
const elink = document.createElement('a')
elink.download = fileName
elink.style.display = 'nonde'
elink.href = URL.createObjectURL(blob)
document.body.appendChild(elink)
elink.click()
URL.revokeObjectURL(elink.href)
document.body.removeChild(elink)
}).catch(() => {
loading.close()
})
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
@ -266,57 +371,54 @@
this.viewState = 3
this.$refs['divadd'].showEdit(row)
},
toRelevancyInfo(row) {
const tip = '请确认是否删除所选品牌?'
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.deleteGoods(row.sid).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(() => {})
},
resetState() {
this.viewState = 1
},
enableChange(sid, state) {
console.log('sid', sid)
console.log('state', state)
req.updateIsEnable(sid, state).then((resp) => {
if (resp.success) {
this.$message({
type: 'success',
message: '状态已更新',
showClose: true
})
} else { // 根据resp.code进行异常情况处理
}
}).catch(e => {
console.log(e)
})
}
}
}
</script>
<style scoped>
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.must {
color: #f00;
}
.span-sty {
width: 90px !important;
}
.addinputInfo {
margin-left: 80px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 80px !important;
width: calc(100% - 70px);
}
.first_row {
border-top: 1px solid #E0E3EB;
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
/deep/ .el-form-item__error {
margin-left: 180px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
display: inline;
line-height: 1px;
vertical-align: middle;
}
</style>

Write Preview
Loading…
Cancel
Save