|
|
@@ -230,27 +230,31 @@
|
|
|
/>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <!-- <el-form-item label="上传凭证" >
|
|
|
- <el-upload
|
|
|
- class="upload-demo"
|
|
|
- :limit="1"
|
|
|
- :on-preview="handlePreview"
|
|
|
- :on-change="handleChange"
|
|
|
- :on-remove="handleRemove"
|
|
|
- :before-remove="beforeRemove"
|
|
|
- :on-exceed="handleExceed"
|
|
|
- :action="BASE_API+'/common/bidding/voucher'"
|
|
|
- name="multipartFile"
|
|
|
- list-type="text"
|
|
|
- :file-list="fileList"
|
|
|
- multiple
|
|
|
- >
|
|
|
- <el-button class="el-icon-upload" >上传凭证</el-button>
|
|
|
- </el-upload>
|
|
|
- </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="invoiceRate">
|
|
|
+ <el-input v-model="form.invoiceRate" style="width: 80%;" placeholder="发票税率"><template slot="append">%</template></el-input>
|
|
|
+ <!-- <span style="fontSize:16px" effect="plain">{{form.quantity}} (吨)</span> -->
|
|
|
+ <!-- <el-input v-model="form.quantity" style="width: 80%;" placeholder="请输入数量"></el-input> -->
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
|
|
|
+ <el-form-item label="发票种类" prop="invoiceType">
|
|
|
+ <el-select v-model="form.invoiceType" style="width: 80%;" filterable placeholder="请选择发票种类">
|
|
|
+ <el-option
|
|
|
+ v-for="item in invoiceType"
|
|
|
+ :key="item.id"
|
|
|
+ :label="item.name"
|
|
|
+ :value="item.id"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
|
|
|
<el-row :gutter="20">
|
|
|
<el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
|
|
|
@@ -265,7 +269,7 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
|
|
|
- <el-form-item label="交货日期" prop="deliveryDate">
|
|
|
+ <el-form-item label="交货日期" >
|
|
|
<el-date-picker
|
|
|
v-model="deliveryDate"
|
|
|
:clearable="false"
|
|
|
@@ -286,32 +290,42 @@
|
|
|
|
|
|
<el-row :gutter="20">
|
|
|
<el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
|
|
|
-
|
|
|
+ <el-form-item label="交货地点" prop="deliveryLocation">
|
|
|
+ <el-input v-model="form.deliveryLocation" style="width: 80%;" placeholder="请输入交货地点"></el-input>
|
|
|
+ </el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6" :xs="24" :sm="12" :md="12" :lg="12">
|
|
|
- <el-form-item label="运输方式" prop="transportMode">
|
|
|
- <el-select v-model="form.transportMode" style="width: 80%;" filterable placeholder="请选择包装方式">
|
|
|
- <el-option
|
|
|
- v-for="item in transportMode"
|
|
|
- :key="item.id"
|
|
|
- :label="item.name"
|
|
|
- :value="item.id"
|
|
|
- />
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
+ <el-form-item label="联系电话" >
|
|
|
+ <el-input v-model="form.phone" style="width: 80%;" max="11" placeholder="请输入联系电话"></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="phone">
|
|
|
- <el-input v-model="form.phone" style="width: 80%;" placeholder="请输入联系电话"></el-input>
|
|
|
- </el-form-item>
|
|
|
+ <el-form-item label="上传凭证" >
|
|
|
+ <el-upload
|
|
|
+ class="upload-demo"
|
|
|
+ :limit="1"
|
|
|
+ :on-preview="handlePreview"
|
|
|
+ :on-change="handleChange"
|
|
|
+ :on-remove="handleRemove"
|
|
|
+ :before-remove="beforeRemove"
|
|
|
+ :on-exceed="handleExceed"
|
|
|
+ :action="BASE_API+'/common/bidding/voucher'"
|
|
|
+ name="multipartFile"
|
|
|
+ list-type="text"
|
|
|
+ :file-list="fileList"
|
|
|
+ multiple
|
|
|
+ >
|
|
|
+ <el-button class="el-icon-upload" >上传凭证</el-button>
|
|
|
+ </el-upload>
|
|
|
+ </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.biddingLogisticsRemark"
|
|
|
+ v-model="form.remark"
|
|
|
type="textarea"
|
|
|
style="width: 93%;"
|
|
|
:autosize="{ minRows: 2, maxRows: 10}"
|
|
|
@@ -379,23 +393,26 @@ export default {
|
|
|
pageSize: 10,
|
|
|
total: 0, // 总数量
|
|
|
rules1:{
|
|
|
- departureStation:[
|
|
|
- { required: true, message: '始发车站不为空', trigger: 'blur' },
|
|
|
+ dateManufacture:[
|
|
|
+ { required: true, message: '生产日期不为空', trigger: 'blur' },
|
|
|
],
|
|
|
- destinationStation:[
|
|
|
- { required: true, message: '目的车站不为空', trigger: 'blur' },
|
|
|
+ deliveryStartTime:[
|
|
|
+ { required: true, message: '交货日期不为空', trigger: 'blur' },
|
|
|
],
|
|
|
biddingPrice:[
|
|
|
{ required: true, message: '投标价格不为空', trigger: 'blur' },
|
|
|
],
|
|
|
- packingWay:[
|
|
|
- { required: true, message: '包装方式不为空', trigger: 'blur' },
|
|
|
+ deliveryLocation:[
|
|
|
+ { required: true, message: '交货地点不为空', trigger: 'blur' },
|
|
|
+ ],
|
|
|
+ invoiceRate:[
|
|
|
+ { required: true, message: '发票率不为空', trigger: 'blur' },
|
|
|
],
|
|
|
- phone:[
|
|
|
- { required: true, message: '联系电话不为空', trigger: 'blur' },
|
|
|
+ invoiceType:[
|
|
|
+ { required: true, message: '发票种类不为空', trigger: 'blur' },
|
|
|
],
|
|
|
- transportMode:[
|
|
|
- { required: true, message: '运输方式不为空', trigger: 'blur' },
|
|
|
+ priceProvision:[
|
|
|
+ { required: true, message: '价格条款不为空', trigger: 'blur' },
|
|
|
],
|
|
|
},
|
|
|
rules: {
|
|
|
@@ -447,6 +464,10 @@ export default {
|
|
|
{id:1,name:"港口平仓价"},
|
|
|
{id:2,name:"到厂价"},
|
|
|
{id:3,name:"自提价"},
|
|
|
+ ],
|
|
|
+ invoiceType:[
|
|
|
+ {id:1,name:"普票"},
|
|
|
+ {id:2,name:"专票"},
|
|
|
],
|
|
|
activeName: 'first',
|
|
|
dialogTableVisible:false,
|
|
|
@@ -657,11 +678,13 @@ export default {
|
|
|
this.isAdd = true
|
|
|
this.form = {}
|
|
|
this.fileList = []
|
|
|
+ this.deliveryDate = []
|
|
|
this.form.breeds = row.breeds
|
|
|
this.form.tenderRawCode = row.tenderRawCode
|
|
|
this.form.rawTenderId = row.rawTenderId
|
|
|
this.form.tenderParentId = this.param.tenderParentId
|
|
|
this.form.quantity = row.number
|
|
|
+
|
|
|
|
|
|
// this.form.goodsName = row.goodsName
|
|
|
// this.form.transportUnitPrice = row.transportUnitPrice
|
