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 11 months ago
parent
b395e2b9d7 fcb24d62cf
commit
2df6e065ac
4 changed files with 41 additions and 27 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. 33
      yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue
  2. 2
      yxt-as-ui/src/views/storage/deliveryNotice/receiptInfo.vue
  3. 15
      yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue
  4. 18
      yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsInfo.vue

33
yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue
View File

@ -21,14 +21,15 @@
<div>基础信息</div>
</div>
<el-row>
<el-col :span="8">
<div class="span-sty">单据编号</div>
<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><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">制单部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.departmentName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">单据日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
@ -114,7 +115,7 @@
</el-select>
</template>
</el-table-column> -->
<el-table-column label="预约数量" prop="orderCount" align="center" width="120" />
<!-- <el-table-column label="预约数量" prop="orderCount" align="center" width="120" /> -->
<el-table-column label="实收数量" align="center" width="120">
<template slot-scope="scope">
<el-input ref="focusAssumptionInput" @input="commodityComputeYHAndXSJE(scope.row,$event)"
@ -220,6 +221,10 @@
busTypeKey: "",
busTypeValue: "",
createByName: window.sessionStorage.getItem('name'),
departmentName: window.sessionStorage.getItem('departmentName'),
createBySid: window.sessionStorage.getItem('userSid'),
useOrgSid: window.sessionStorage.getItem('departmentSid'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
billState: '新建',
billStateKey: 0,
reviewStatus: "",
@ -443,19 +448,22 @@
console.log("aaa", row);
console.log("aaa", val);
if (Number(row.actualInCount) > Number(row.orderCount)) {
row.actualInCount = row.orderCount
}
// if (Number(row.actualInCount) > Number(row.orderCount)) {
row.actualInCount = val
// }
row.amount = (Number(row.actualInCount) * Number(row.cost)).toFixed(2)
},
commodityComputeYHAndXSJE2(row, val) {
console.log("aaa", row);
console.log("aaa", val);
if ((Number(row.rejectCount) + Number(row.actualInCount)) > Number(row.orderCount)) {
row.rejectCount = Number(row.orderCount) - Number(row.actualInCount)
}
row.rejectCount = val
// if ((Number(row.rejectCount) + Number(row.actualInCount)) > Number(row.orderCount)) {
// row.rejectCount = Number(row.orderCount) - Number(row.actualInCount)
// }
},
@ -649,6 +657,7 @@
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.submitdisabled = false
this.formobj = {
sourceBillNo: "",
busTypeKey: "",

2
yxt-as-ui/src/views/storage/deliveryNotice/receiptInfo.vue
View File

@ -81,7 +81,7 @@
</div>
<el-table v-loading="listLoading" :data="formobj.list" border style="width: 100%;">
<el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80" />
<el-table-column fixed label="商品名称" prop="goodsSkuTitle" align="center" />
<el-table-column fixed label="商品名称" prop="goodsSpuName" align="center" />
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
<el-table-column label="单位" prop="unit" align="center" width="120" />

15
yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue
View File

@ -20,14 +20,18 @@
<el-row>
<el-col :span="8">
<div class="span-sty">单据编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
<div class="span-sty">制单人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">制单部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.departmentName }}</span></el-form-item>
</el-col>
<!-- <el-col :span="8">
<div class="span-sty">制单人</div>
<el-form-item> <el-input v-model="formobj.createByName" placeholder="" class="addinputw addinputInfo"
clearable /></el-form-item>
</el-col>
</el-col> -->
<el-col :span="8">
<div class="span-sty">单据日期</div>
<el-form-item> <el-date-picker v-model="formobj.createTime" type="date" class="addinputInfo"
@ -270,6 +274,7 @@
"sourceBillNo": "",
"createBySid": window.sessionStorage.getItem('userSid'),
"createByName": window.sessionStorage.getItem('name'),
"departmentName": window.sessionStorage.getItem('departmentName'),
"createTime": "",
"busTypeKey": "",
"busTypeValue": "",
@ -350,7 +355,7 @@
row.actualInCount = 0
row.rejectCount = 0
row.rejectReason = ''
row.isQuality = 0
row.isQuality = 1
row.qualityState = 0
row.packageRemark = ''
row.cost = value.cost
@ -393,7 +398,7 @@
"actualInCount": 0,
"rejectCount": 0,
"rejectReason": "",
"isQuality": 0,
"isQuality": 1,
"qualityState": 0,
"packageRemark": "",
"state": 0,

18
yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsInfo.vue
View File

@ -19,15 +19,15 @@
<div>基础信息</div>
</div>
<el-row>
<el-col :span="8">
<div class="span-sty">单据编号</div>
<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><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">制单部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.departmentName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">单据日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
@ -83,9 +83,9 @@
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" width="150" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
<el-table-column label="单位" prop="unit" align="center" width="120" />
<el-table-column label="仓库" prop="warehouseName" align="center" width="180" />
<!-- <el-table-column label="仓库" prop="warehouseName" align="center" width="180" />
<el-table-column label="库位" prop="warehouseRackName" align="center" width="180" />
<el-table-column label="预约数量" prop="orderCount" align="center" width="120" />
<el-table-column label="预约数量" prop="orderCount" align="center" width="120" /> -->
<el-table-column label="实收数量" prop="actualInCount" align="center" width="120" />
<el-table-column label="拒收数量" prop="rejectCount" align="center" width="120" />
<el-table-column label="拒收原因" prop="rejectReason" align="center" width="180" />
@ -113,7 +113,7 @@
</el-table>
<div class="title titleOne">
<!-- <div class="title titleOne">
<div>商品-批次</div>
</div>
<el-table v-loading="listLoading" :data="formobj.pcList" border style="width: 100%;">
@ -129,7 +129,7 @@
<el-table-column label="生产日期" prop="manufactureDate" align="center" width="180" />
<el-table-column label="有效期" prop="expirationDate" align="center" width="180" />
<el-table-column label="数量" prop="batchCount" align="center" width="120" />
</el-table>
</el-table> -->
</el-form>

Write Preview
Loading…
Cancel
Save