|
|
@@ -237,10 +237,10 @@
|
|
|
|
|
|
<el-row :gutter="20">
|
|
|
<el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
|
|
|
- <el-form-item label="等级" prop="Level">
|
|
|
+ <el-form-item label="等级" prop="level">
|
|
|
<div>
|
|
|
<!-- <el-input v-model="form.comesFrom" readonly style="width: 88%;" placeholder=""></el-input> -->
|
|
|
- <el-select v-model="form.Level" style="width: 88%;" filterable placeholder="请选择等级">
|
|
|
+ <el-select v-model="form.level" style="width: 88%;" filterable placeholder="请选择等级">
|
|
|
<el-option
|
|
|
v-for="item in gradeList"
|
|
|
:key="item.id"
|
|
|
@@ -271,7 +271,7 @@
|
|
|
<el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
|
|
|
<el-form-item label="加工厂出糙率" prop="brownRiceRate">
|
|
|
<div class="typeNumber">
|
|
|
- <el-input v-model.number="form.brownRiceRate" type="number" style="width: 88%;" @blur="(form.brownRiceRate <= 0) ? form.brownRiceRate='' : form.brownRiceRate" placeholder="请输入加工厂出糙率"><template slot="append">(%)</template></el-input>
|
|
|
+ <el-input v-model="form.brownRiceRate" style="width: 88%;" placeholder="请输入加工厂出糙率"><template slot="append">(%)</template></el-input>
|
|
|
</div>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -299,7 +299,7 @@
|
|
|
<el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
|
|
|
<el-form-item label="库点至加工厂的短运费" prop="warehouseFactoryPrice">
|
|
|
<div class="typeNumber">
|
|
|
- <el-input v-model.number="form.warehouseFactoryPrice" type="number" style="width: 88%;" @blur="(form.warehouseFactoryPrice <= 0) ? form.warehouseFactoryPrice='' : form.warehouseFactoryPrice" placeholder="请输入库点至加工厂的短运费"><template slot="append">(元/吨)</template></el-input>
|
|
|
+ <el-input v-model.number="form.warehouseFactoryPrice" type="number" style="width: 88%;" @input="change1" placeholder="请输入库点至加工厂的短运费"><template slot="append">(元/吨)</template></el-input>
|
|
|
</div>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -323,33 +323,15 @@
|
|
|
</el-col>
|
|
|
|
|
|
<el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
|
|
|
- <el-form-item label="上站费" prop="stationPrice">
|
|
|
+ <el-form-item label="合同编号" prop="contractNumber">
|
|
|
<div class="typeNumber">
|
|
|
- <el-input v-model.number="form.stationPrice" type="number" style="width: 88%;" @blur="(form.stationPrice <= 0) ? form.stationPrice='' : form.stationPrice" placeholder="请输入上站费"></el-input>
|
|
|
+ <el-input v-model="form.contractNumber" style="width: 88%;" placeholder="请输入合同编号"></el-input>
|
|
|
</div>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
|
|
|
- <el-row :gutter="20">
|
|
|
- <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
|
|
|
- <el-form-item label="站台使用费" prop="stationUsePrice">
|
|
|
- <div class="typeNumber">
|
|
|
- <el-input v-model.number="form.stationUsePrice" type="number" style="width: 88%;" @blur="(form.stationUsePrice <= 0) ? form.stationUsePrice='' : form.stationUsePrice" placeholder="请输入站台使用费"></el-input>
|
|
|
- </div>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
-
|
|
|
- <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
|
|
|
- <el-form-item label="运费" prop="freightPrice">
|
|
|
- <div class="typeNumber">
|
|
|
- <el-input v-model.number="form.freightPrice" type="number" style="width: 88%;" @blur="(form.freightPrice <= 0) ? form.freightPrice='' : form.freightPrice" placeholder="请输入运费"></el-input>
|
|
|
- </div>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- </el-row>
|
|
|
-
|
|
|
- <el-row :gutter="20">
|
|
|
+ <el-row :gutter="20">
|
|
|
<el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
|
|
|
<el-form-item label="联系电话" >
|
|
|
<el-input v-model="form.phone" style="width: 88%;" maxlength="11" placeholder="请输入联系电话"></el-input>
|
|
|
@@ -378,6 +360,166 @@
|
|
|
</el-row>
|
|
|
|
|
|
|
|
|
+ <el-form-item label="( 鲅鱼圈 ) " size="mini" style="font-szie:50px" >
|
|
|
+ </el-form-item>
|
|
|
+ <el-row :gutter="20">
|
|
|
+ <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
|
|
|
+ <el-form-item label="站台使用费" prop="byqStationUsePrice" required>
|
|
|
+ <div class="typeNumber">
|
|
|
+ <el-input v-model.number="form.byqStationUsePrice" type="number" style="width: 88%;" @input="change1" placeholder="请输入站台使用费"></el-input>
|
|
|
+ </div>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+
|
|
|
+ <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
|
|
|
+ <el-form-item label="运费" prop="byqFreightPrice" required>
|
|
|
+ <div class="typeNumber">
|
|
|
+ <el-input v-model.number="form.byqFreightPrice" type="number" @input="change1" style="width: 88%;" placeholder="请输入运费"></el-input>
|
|
|
+ </div>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+
|
|
|
+ <el-row :gutter="20">
|
|
|
+ <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
|
|
|
+ <el-form-item label="上站费" prop="byqStationPrice" required>
|
|
|
+ <div class="typeNumber">
|
|
|
+ <el-input v-model.number="form.byqStationPrice" type="number" @input="change1" style="width: 88%;" placeholder="请输入上站费"></el-input>
|
|
|
+ </div>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+
|
|
|
+ <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
|
|
|
+ <el-form-item label="备注" prop="byqOtherRemarks" >
|
|
|
+ <el-input
|
|
|
+ v-model="form.byqOtherRemarks"
|
|
|
+ type="textarea"
|
|
|
+ style="width: 88%;"
|
|
|
+ :autosize="{ minRows: 1, maxRows: 5}"
|
|
|
+ show-word-limit
|
|
|
+ placeholder="请输入内容"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+
|
|
|
+ <el-row :gutter="20">
|
|
|
+ <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
|
|
|
+ <el-form-item label="合计" prop="quantity">
|
|
|
+ <!-- <el-input :value="form.byqStationUsePrice || form.byqFreightPrice ? (form.byqStationUsePrice + form.byqFreightPrice + form.byqStationPrice).toFixed(2) :0" readonly style="width: 80%;" placeholder="请输入金额"><template slot="append">(元)</template></el-input> -->
|
|
|
+ <el-input :value="(Number(form.byqStationUsePrice) + Number(form.byqFreightPrice) + Number(form.byqStationPrice)).toFixed(2)" readonly style="width: 80%;" placeholder="请输入金额"><template slot="append">(元)</template></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+
|
|
|
+ <el-form-item label="( 至锦州港运费 ) " size="mini" style="font-szie:50px" >
|
|
|
+ </el-form-item>
|
|
|
+ <el-row :gutter="20">
|
|
|
+ <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
|
|
|
+ <el-form-item label="站台使用费" prop="jzgStationUsePrice" required>
|
|
|
+ <div class="typeNumber">
|
|
|
+ <el-input v-model.number="form.jzgStationUsePrice" type="number" style="width: 88%;" @input="change1" placeholder="请输入站台使用费"></el-input>
|
|
|
+ </div>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+
|
|
|
+ <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
|
|
|
+ <el-form-item label="运费" prop="jzgFreightPrice" required>
|
|
|
+ <div class="typeNumber">
|
|
|
+ <el-input v-model.number="form.jzgFreightPrice" type="number" @input="change1" style="width: 88%;" placeholder="请输入运费"></el-input>
|
|
|
+ </div>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+
|
|
|
+ <el-row :gutter="20">
|
|
|
+ <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
|
|
|
+ <el-form-item label="上站费" prop="jzgStationPrice" required>
|
|
|
+ <div class="typeNumber">
|
|
|
+ <el-input v-model.number="form.jzgStationPrice" type="number" @input="change1" style="width: 88%;" placeholder="请输入上站费"></el-input>
|
|
|
+ </div>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+
|
|
|
+ <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
|
|
|
+ <el-form-item label="备注" prop="jzgOtherRemarks">
|
|
|
+ <el-input
|
|
|
+ v-model="form.jzgOtherRemarks"
|
|
|
+ type="textarea"
|
|
|
+ style="width: 88%;"
|
|
|
+ :autosize="{ minRows: 1, maxRows: 5}"
|
|
|
+ show-word-limit
|
|
|
+ placeholder="请输入内容"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+
|
|
|
+ <el-row :gutter="20">
|
|
|
+ <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
|
|
|
+ <el-form-item label="合计" prop="quantity">
|
|
|
+ <el-input :value="(Number(form.jzgStationUsePrice) + Number(form.jzgFreightPrice) + Number(form.jzgStationPrice)).toFixed(2)" readonly style="width: 80%;" placeholder="请输入金额"><template slot="append">(元)</template></el-input>
|
|
|
+ <!-- <el-input :v-model="(form.byqStationUsePrice + form.byqFreightPrice + form.byqStationPrice).toFixed(2) " readonly style="width: 80%;" placeholder="请输入金额"><template slot="append">(元)</template></el-input> -->
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+
|
|
|
+ <el-form-item label="( 至绥中港运费 ) " size="mini" style="font-szie:50px" >
|
|
|
+ </el-form-item>
|
|
|
+ <el-row :gutter="20">
|
|
|
+ <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
|
|
|
+ <el-form-item label="站台使用费" prop="szgStationUsePrice" required>
|
|
|
+ <div class="typeNumber">
|
|
|
+ <el-input v-model.number="form.szgStationUsePrice" type="number" style="width: 88%;" @input="change1" placeholder="请输入站台使用费"></el-input>
|
|
|
+ </div>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+
|
|
|
+ <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
|
|
|
+ <el-form-item label="运费" prop="szgFreightPrice" required>
|
|
|
+ <div class="typeNumber">
|
|
|
+ <el-input v-model.number="form.szgFreightPrice" type="number" @input="change1" style="width: 88%;" placeholder="请输入运费"></el-input>
|
|
|
+ </div>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+
|
|
|
+ <el-row :gutter="20">
|
|
|
+ <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
|
|
|
+ <el-form-item label="上站费" prop="szgStationPrice" required>
|
|
|
+ <div class="typeNumber">
|
|
|
+ <el-input v-model.number="form.szgStationPrice" type="number" @input="change1" style="width: 88%;" placeholder="请输入上站费"></el-input>
|
|
|
+ </div>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+
|
|
|
+ <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
|
|
|
+ <el-form-item label="备注" prop="szgOtherRemarks">
|
|
|
+ <el-input
|
|
|
+ v-model="form.szgOtherRemarks"
|
|
|
+ type="textarea"
|
|
|
+ style="width: 88%;"
|
|
|
+ :autosize="{ minRows: 1, maxRows: 5}"
|
|
|
+ show-word-limit
|
|
|
+ placeholder="请输入内容"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+
|
|
|
+ <el-row :gutter="20">
|
|
|
+ <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
|
|
|
+ <el-form-item label="合计" prop="quantity">
|
|
|
+ <el-input :value="(Number(form.szgStationUsePrice) + Number(form.szgFreightPrice) + Number(form.szgStationPrice)).toFixed(2)" readonly style="width: 80%;" placeholder="请输入金额"><template slot="append">(元)</template></el-input>
|
|
|
+ <!-- <el-input :v-model="(form.byqStationUsePrice + form.byqFreightPrice + form.byqStationPrice).toFixed(2) " readonly style="width: 80%;" placeholder="请输入金额"><template slot="append">(元)</template></el-input> -->
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
<!-- <el-row :gutter="20">
|
|
|
<el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
|
|
|
<el-form-item label="加工费" prop="processFee">
|
|
|
@@ -445,17 +587,7 @@
|
|
|
</el-form-item> -->
|
|
|
</el-col>
|
|
|
<el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
|
|
|
- <el-form-item label="备注" prop="biddingLogisticsRemark">
|
|
|
- <el-input
|
|
|
- v-model="form.otherRemarks"
|
|
|
- type="textarea"
|
|
|
- style="width: 88%;"
|
|
|
- :autosize="{ minRows: 2, maxRows: 10}"
|
|
|
- maxlength="500"
|
|
|
- show-word-limit
|
|
|
- placeholder="请输入内容"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
+
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
</el-form>
|
|
|
@@ -470,7 +602,7 @@
|
|
|
<el-button :loading="loading" type="primary" @click="viewDialog = false">返回</el-button>
|
|
|
</div>
|
|
|
|
|
|
- <el-dialog :title="goodsName" width="90%" center :visible.sync="dialogTableVisible" append-to-body>
|
|
|
+ <el-dialog :title="goodsName" width="90%" style="margin-top:-100px" center :visible.sync="dialogTableVisible" append-to-body>
|
|
|
<ckDialog ref="ckDialog"></ckDialog>
|
|
|
</el-dialog>
|
|
|
|
|
|
@@ -480,7 +612,7 @@
|
|
|
|
|
|
<script>
|
|
|
|
|
|
-import { getTenderProcessing,getBiddingAdd } from '@/api/tender'
|
|
|
+import { getTenderProcessing,getBiddingAdd1 } from '@/api/tender'
|
|
|
import { Notification, MessageBox } from 'element-ui'
|
|
|
|
|
|
import ckTable from './table.vue'
|
|
|
@@ -520,7 +652,7 @@ export default {
|
|
|
biddingNumber:[
|
|
|
{ required: true, message: '投标数量不为空', trigger: 'blur' },
|
|
|
],
|
|
|
- Level:[
|
|
|
+ level:[
|
|
|
{ required: true, message: '等级不为空', trigger: 'blur' },
|
|
|
],
|
|
|
brownRiceRate:[
|
|
|
@@ -539,7 +671,10 @@ export default {
|
|
|
{ required: true, message: '稻壳自提单价不为空', trigger: 'blur' },
|
|
|
],
|
|
|
cornProcurePrice:[
|
|
|
- { required: true, message: '玉米采购价(不为空', trigger: 'blur' },
|
|
|
+ { required: true, message: '玉米采购价不为空', trigger: 'blur' },
|
|
|
+ ],
|
|
|
+ contractNumber:[
|
|
|
+ { required: true, message: '合同编号不为空', trigger: 'blur' },
|
|
|
],
|
|
|
stationPrice:[
|
|
|
{ required: true, message: '上站费不为空', trigger: 'blur' },
|
|
|
@@ -562,6 +697,12 @@ export default {
|
|
|
{ validator: checkTel, trigger: 'blur' }
|
|
|
]
|
|
|
},
|
|
|
+ gradeList:[
|
|
|
+ {id:"1",name:"一级"},
|
|
|
+ {id:"2",name:"二级"},
|
|
|
+ {id:"3",name:"三级"},
|
|
|
+ {id:"4",name:"四级"},
|
|
|
+ ],
|
|
|
query: {
|
|
|
type: '',
|
|
|
value: '',
|
|
|
@@ -607,6 +748,9 @@ export default {
|
|
|
// this.getDictData()
|
|
|
},
|
|
|
methods: {
|
|
|
+ change1() {
|
|
|
+ this.$forceUpdate()
|
|
|
+},
|
|
|
changeAdd(row){
|
|
|
console.log(row)
|
|
|
this.handleAdd(row)
|
|
|
@@ -766,13 +910,14 @@ export default {
|
|
|
|
|
|
// 字典名称提交动作
|
|
|
doSubmit() {
|
|
|
+ console.log(this.form)
|
|
|
this.$refs['form'].validate((valid) => {
|
|
|
if (valid) {
|
|
|
if (this.isAdd) {
|
|
|
// 新增字典
|
|
|
console.log(this.form)
|
|
|
this.loading = true
|
|
|
- getBiddingAdd(this.form).then((res) => {
|
|
|
+ getBiddingAdd1(this.form).then((res) => {
|
|
|
if (res.data.code === 200) {
|
|
|
this.$message({ message: '操作成功', type: 'success' })
|
|
|
} else {
|
|
|
@@ -808,17 +953,36 @@ export default {
|
|
|
this.fileList = []
|
|
|
this.form.breeds = row.breeds
|
|
|
this.form.comesFrom = row.comesFrom
|
|
|
- this.form.level = row.level
|
|
|
+ // this.form.level = row.level
|
|
|
this.form.tenderParentId = this.param.tenderParentId
|
|
|
this.form.tenderProcessingId = row.tenderProcessingId
|
|
|
this.form.processingCode = row.processingCode
|
|
|
this.form.quantity = row.quantity
|
|
|
this.form.target = this.bidInfo.target //加工承揽 （询价）或者（报价）
|
|
|
// 出库辅助费默认为0
|
|
|
- this.$set(this.form, "storageAssistFee", 0)
|
|
|
- if (this.$refs['form']) {
|
|
|
- this.$refs['form'].resetFields()
|
|
|
- }
|
|
|
+ // this.$set(this.form, "warehouseFactoryPrice", 0)
|
|
|
+ // 鳗鱼
|
|
|
+ // let number = (0).toFixed(2)
|
|
|
+ let number = 0
|
|
|
+ this.form.byqFreightPrice = number
|
|
|
+ this.form.byqStationPrice = number
|
|
|
+ this.form.warehouseFactoryPrice = number
|
|
|
+ this.form.byqStationUsePrice = number
|
|
|
+
|
|
|
+ this.form.jzgFreightPrice = number
|
|
|
+ this.form.jzgStationPrice = number
|
|
|
+ this.form.jzgStationUsePrice = number
|
|
|
+
|
|
|
+ this.form.szgFreightPrice =number
|
|
|
+ this.form.szgStationPrice = number
|
|
|
+ this.form.szgStationUsePrice =number
|
|
|
+ // this.$set(this.form, "byqFreightPrice", 0)
|
|
|
+ // this.$set(this.form, "byqStationPrice", 0)
|
|
|
+ // this.$set(this.form, "byqStationUsePrice", 0)
|
|
|
+
|
|
|
+ // if (this.$refs['form']) {
|
|
|
+ // this.$refs['form'].resetFields()
|
|
|
+ // }
|
|
|
},
|
|
|
// 编辑字典
|
|
|
handleEdit: function(row) {
|
|
|
@@ -1018,5 +1182,11 @@ export default {
|
|
|
-moz-appearance: textfield !important;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+/deep/ .el-form-item--mini.el-form-item{
|
|
|
+ font-szie:15px;
|
|
|
+ font-weight: bold;
|
|
|
+}
|
|
|
</style>
|
|
|
|
