|
@@ -1235,7 +1235,6 @@
|
|
<el-button
|
|
<el-button
|
|
size="small"
|
|
size="small"
|
|
@click.prevent="handleSelect(3)"
|
|
@click.prevent="handleSelect(3)"
|
|
- :disabled="browseStatus"
|
|
|
|
type="danger"
|
|
type="danger"
|
|
>作业费协议
|
|
>作业费协议
|
|
</el-button>
|
|
</el-button>
|
|
@@ -1725,6 +1724,7 @@
|
|
align="center"
|
|
align="center"
|
|
label="操作"
|
|
label="操作"
|
|
width="200px"
|
|
width="200px"
|
|
|
|
+ fixed="right"
|
|
>
|
|
>
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
<el-button
|
|
<el-button
|
|
@@ -1784,7 +1784,6 @@
|
|
type="danger"
|
|
type="danger"
|
|
size="small"
|
|
size="small"
|
|
@click.prevent="handleSelect(1)"
|
|
@click.prevent="handleSelect(1)"
|
|
- :disabled="browseStatus"
|
|
|
|
>作业费协议
|
|
>作业费协议
|
|
</el-button
|
|
</el-button
|
|
>
|
|
>
|
|
@@ -2102,7 +2101,8 @@
|
|
>
|
|
>
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
<span v-if="scope.row.fSrcTypeId === 0">录入</span>
|
|
<span v-if="scope.row.fSrcTypeId === 0">录入</span>
|
|
- <span v-if="scope.row.fSrcTypeId !== 0">协议</span>
|
|
|
|
|
|
+ <span v-if="scope.row.fSrcTypeId == 1">协议</span>
|
|
|
|
+ <span v-if="scope.row.fSrcTypeId == 10">变更</span>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column
|
|
<el-table-column
|
|
@@ -2126,6 +2126,7 @@
|
|
align="center"
|
|
align="center"
|
|
width="200px"
|
|
width="200px"
|
|
label="操作"
|
|
label="操作"
|
|
|
|
+ fixed="right"
|
|
>
|
|
>
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
<!-- <el-button size="small">审核费用</el-button> -->
|
|
<!-- <el-button size="small">审核费用</el-button> -->
|
|
@@ -3687,7 +3688,7 @@
|
|
@pagination="getWhgenlegList(key_id)"
|
|
@pagination="getWhgenlegList(key_id)"
|
|
/>
|
|
/>
|
|
<div slot="footer" class="dialog-footer">
|
|
<div slot="footer" class="dialog-footer">
|
|
- <el-button type="primary" @click="zhgenlegData">导 入</el-button>
|
|
|
|
|
|
+ <el-button type="primary" @click="zhgenlegData" :disabled="browseStatus">导 入</el-button>
|
|
<el-button
|
|
<el-button
|
|
@click="
|
|
@click="
|
|
warehousingagreements = false;
|
|
warehousingagreements = false;
|
|
@@ -6722,7 +6723,6 @@ export default {
|
|
let fAmount = 0;
|
|
let fAmount = 0;
|
|
fAmount = e.fPrice * qty;
|
|
fAmount = e.fPrice * qty;
|
|
if (this.key_id == 3) {
|
|
if (this.key_id == 3) {
|
|
- console.log('乖乖齐齐')
|
|
|
|
this.warehouseDrList.push({
|
|
this.warehouseDrList.push({
|
|
fQty: qty,
|
|
fQty: qty,
|
|
fCorpid: e.fCorpid,
|
|
fCorpid: e.fCorpid,
|
|
@@ -6737,12 +6737,11 @@ export default {
|
|
fProductName: this.form.fProductName,
|
|
fProductName: this.form.fProductName,
|
|
fMarks: this.form.fMarks,
|
|
fMarks: this.form.fMarks,
|
|
fBusinessType: this.form.fBusinessType,
|
|
fBusinessType: this.form.fBusinessType,
|
|
- fSrcTypeId: e.fId,
|
|
|
|
|
|
+ fSrcTypeId: 1,
|
|
fBillingway: e.fFeeUnitid,
|
|
fBillingway: e.fFeeUnitid,
|
|
remark: e.remark,
|
|
remark: e.remark,
|
|
});
|
|
});
|
|
} else {
|
|
} else {
|
|
- console.log('奇奇怪怪')
|
|
|
|
this.warehouseCrList.push({
|
|
this.warehouseCrList.push({
|
|
fQty: qty,
|
|
fQty: qty,
|
|
fCorpid: e.fCorpid,
|
|
fCorpid: e.fCorpid,
|
|
@@ -6757,7 +6756,7 @@ export default {
|
|
fProductName: this.form.fProductName,
|
|
fProductName: this.form.fProductName,
|
|
fMarks: this.form.fMarks,
|
|
fMarks: this.form.fMarks,
|
|
fBusinessType: this.form.fBusinessType,
|
|
fBusinessType: this.form.fBusinessType,
|
|
- fSrcTypeId: e.fId,
|
|
|
|
|
|
+ fSrcTypeId: 1,
|
|
});
|
|
});
|
|
}
|
|
}
|
|
});
|
|
});
|