|
@@ -181,6 +181,7 @@
|
|
|
:disabled="browseStatus || form.warehouseStatus > 3"
|
|
|
style="width: 80%"
|
|
|
placeholder="请输入模糊查找"
|
|
|
+ @change="fStorekeeperChange"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(item, index) in userOptions"
|
|
@@ -3515,11 +3516,11 @@
|
|
|
<td>{{ item.fMblno }}</td>
|
|
|
<td>{{ item.fCntrno }}</td>
|
|
|
<td>{{ item.fQty }}</td>
|
|
|
- <td v-if="item.fGrossweight && radio == 1">
|
|
|
- {{ (item.fGrossweight / 1000).toFixed(4) }}
|
|
|
+ <td v-if="item.fNetweight && radio == 1">
|
|
|
+ {{ (item.fNetweight / 1000).toFixed(4) }}
|
|
|
</td>
|
|
|
- <td v-else-if="item.fGrossweight && radio == 2">
|
|
|
- {{ item.fGrossweight }}
|
|
|
+ <td v-else-if="item.fNetweight && radio == 2">
|
|
|
+ {{ item.fNetweight }}
|
|
|
</td>
|
|
|
<td v-else></td>
|
|
|
<td>{{ form.fCartype | fCartypeFormat(fCartypeOptions) }}</td>
|
|
@@ -3625,11 +3626,11 @@
|
|
|
<td>{{ item.fBusinessType | fStorageTypeFormat(fStorageTypeOptions) }}</td>
|
|
|
<td>{{ item.fMarks }}</td>
|
|
|
<td>{{ item.fQty }}</td>
|
|
|
- <td v-if="item.fGrossweight && radio == 1">
|
|
|
- {{ (item.fGrossweight / 1000).toFixed(4) }}
|
|
|
+ <td v-if="item.fNetweight && radio == 1">
|
|
|
+ {{ (item.fNetweight / 1000).toFixed(4) }}
|
|
|
</td>
|
|
|
- <td v-else-if="item.fGrossweight && radio == 2">
|
|
|
- {{ item.fGrossweight }}
|
|
|
+ <td v-else-if="item.fNetweight && radio == 2">
|
|
|
+ {{ item.fNetweight }}
|
|
|
</td>
|
|
|
<td v-else></td>
|
|
|
<td>{{ form.fCartype | fCartypeFormat(fCartypeOptions) }}</td>
|
|
@@ -3779,7 +3780,7 @@
|
|
|
style="display: flex; justify-content: space-between; font-size: 12px"
|
|
|
>
|
|
|
<div>操作:{{ form.createBy }}</div>
|
|
|
- <div>库管:{{ form.fContacts }}</div>
|
|
|
+ <div>库管:{{ form.fStorekeeper | fStorekeeperFormat(userOptions) }}</div>
|
|
|
<div style="width: 100px">叉车:</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -3871,7 +3872,7 @@
|
|
|
</table>
|
|
|
</div>
|
|
|
<div style="display: flex; justify-content: space-between; font-size: 12px">
|
|
|
- <div>库管:{{ form.fContacts }}</div>
|
|
|
+ <div>库管:{{ form.fStorekeeper | fStorekeeperFormat(userOptions) }}</div>
|
|
|
<div style="width: 100px">叉车:</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -3974,7 +3975,7 @@
|
|
|
<div
|
|
|
style="display: flex; justify-content: space-between; font-size: 12px"
|
|
|
>
|
|
|
- <div>库管:{{ form.fContacts }}</div>
|
|
|
+ <div>库管:{{ form.fStorekeeper | fStorekeeperFormat(userOptions) }}</div>
|
|
|
<div style="width: 130px;margin-right: 20px">叉车:</div>
|
|
|
</div>
|
|
|
<div
|
|
@@ -4093,7 +4094,7 @@
|
|
|
<div
|
|
|
style="display: flex; justify-content: space-between; font-size: 12px"
|
|
|
>
|
|
|
- <div>库管:{{ form.fContacts }}</div>
|
|
|
+ <div>库管:{{ form.fStorekeeper | fStorekeeperFormat(userOptions) }}</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<span slot="footer" class="dialog-footer">
|
|
@@ -4210,7 +4211,7 @@
|
|
|
<div
|
|
|
style="display: flex; justify-content: space-between; font-size: 12px;margin-bottom: 20px"
|
|
|
>
|
|
|
- <div>库管:{{ form.fContacts }}</div>
|
|
|
+ <div>库管:{{ form.fStorekeeper | fStorekeeperFormat(userOptions) }}</div>
|
|
|
<div style="width: 130px;margin-right: 20px">叉车:</div>
|
|
|
</div>
|
|
|
<div
|
|
@@ -5898,6 +5899,15 @@ export default {
|
|
|
});
|
|
|
return fCartype;
|
|
|
},
|
|
|
+ fStorekeeperFormat(row, userOptions) {
|
|
|
+ let nickName;
|
|
|
+ userOptions.map(e => {
|
|
|
+ if (row == e.userName) {
|
|
|
+ nickName = e.nickName;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ return nickName;
|
|
|
+ },
|
|
|
},
|
|
|
methods: {
|
|
|
init() {
|
|
@@ -8325,6 +8335,7 @@ export default {
|
|
|
this.$set(this.form, "fDeptid", this.userVal.deptId);
|
|
|
this.$set(this.form, "createBy", this.userVal.userName);
|
|
|
this.$set(this.form, "fStorekeeper", this.userVal.nickName);
|
|
|
+ this.$set(this.form, "fContacts", this.userVal.nickName);
|
|
|
this.$set(this.form, "fIfdamage", "1");
|
|
|
this.$set(this.form, "fIfweigh", "1");
|
|
|
this.$set(this.form, "fTrademodeid", "1");
|
|
@@ -8837,10 +8848,13 @@ export default {
|
|
|
// 获取仓库信息
|
|
|
warehouseChange() {
|
|
|
getDept(this.form.fWarehouseid).then(res => {
|
|
|
- this.$set(this.form, 'fContacts', res.data.fContacts)
|
|
|
+ // this.$set(this.form, 'fContacts', res.data.fContacts)
|
|
|
this.$set(this.form, 'fTel', res.data.fTel)
|
|
|
})
|
|
|
},
|
|
|
+ fStorekeeperChange() {
|
|
|
+ this.$set(this.form, 'fContacts', this.form.fStorekeeper)
|
|
|
+ },
|
|
|
// 打印费用确认单准备
|
|
|
feesConfirm() {
|
|
|
if (this.Collectionoptionss.length > 0) {
|