|
@@ -121,6 +121,17 @@
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
</div>
|
|
|
+ <!-- 运输单价按钮 -->
|
|
|
+ <div class="materialDrawer">
|
|
|
+ <el-form :inline="true" class="demo-form-inline" label-width="80px">
|
|
|
+ <el-form-item label="运输单价"> </el-form-item>
|
|
|
+ <el-form-item>
|
|
|
+ <el-button type="primary" @click="onprice" class="truckBtn"
|
|
|
+ >浏览</el-button
|
|
|
+ >
|
|
|
+ </el-form-item>
|
|
|
+ </el-form>
|
|
|
+ </div>
|
|
|
<!-- 物资和装卸点以及装卸货次序 -->
|
|
|
<div class="swtichTop">
|
|
|
<span class="titile">点击浏览选择物资之前请选择物资单位!</span>
|
|
@@ -245,7 +256,7 @@
|
|
|
:show-close="false"
|
|
|
:before-close="handleClose2"
|
|
|
>
|
|
|
- <el-input placeholder="请输入内容" v-model="inputMaterial" clearable>
|
|
|
+ <el-input placeholder="请输入内容" v-model="inputMaterial" style="width: 240px" clearable>
|
|
|
</el-input
|
|
|
><el-button type="primary" class="btn" @click="onclickMaterial">
|
|
|
<i class="el-icon-search"></i>查询
|
|
@@ -254,13 +265,15 @@
|
|
|
<!-- <el-button type="primary" @click="makeSure1">确定</el-button> -->
|
|
|
<div class="tablecls">
|
|
|
<!-- 查询所有的物资 -->
|
|
|
- <dilTable
|
|
|
- ref="materialTable"
|
|
|
- v-bind.sync="materialTable"
|
|
|
- @selection-change="selectionChange"
|
|
|
- :drawer="aaadrawer"
|
|
|
- >
|
|
|
- </dilTable>
|
|
|
+ <vue-scroll :ops="ops" style="width:100%;height:100%">
|
|
|
+ <dilTable
|
|
|
+ ref="materialTable"
|
|
|
+ v-bind.sync="materialTable"
|
|
|
+ @selection-change="selectionChange"
|
|
|
+ :drawer="aaadrawer"
|
|
|
+ >
|
|
|
+ </dilTable>
|
|
|
+ </vue-scroll>
|
|
|
</div>
|
|
|
</el-drawer>
|
|
|
</div>
|
|
@@ -304,6 +317,37 @@
|
|
|
></dilTable>
|
|
|
</div>
|
|
|
</el-drawer>
|
|
|
+ <!-- 运输单价模态框 -->
|
|
|
+ <div>
|
|
|
+ <el-drawer
|
|
|
+ :visible.sync="drawerP"
|
|
|
+ :direction="direction"
|
|
|
+ close-on-press-escape
|
|
|
+ modal
|
|
|
+ wrapperClosable
|
|
|
+ size="40%"
|
|
|
+ >
|
|
|
+ <div class="selectText">
|
|
|
+ <el-input v-model="inputP" placeholder="请输入内容" style="width: 240px"></el-input>
|
|
|
+ <el-button
|
|
|
+ type="primary"
|
|
|
+ @click="onpriceSelect"
|
|
|
+ ><i class="el-icon-search"></i>查询</el-button
|
|
|
+ >
|
|
|
+ </div>
|
|
|
+ <div class="LineTable">
|
|
|
+ <vue-scroll :ops="ops" style="width:100%;height:100%">
|
|
|
+ <dilTable
|
|
|
+ v-bind.sync="priceOptions"
|
|
|
+ :isKuang="isKuang"
|
|
|
+ :loading="tableLoading"
|
|
|
+ :drawer="PriceDrawer"
|
|
|
+ @func="funcP"
|
|
|
+ ></dilTable>
|
|
|
+ </vue-scroll>
|
|
|
+ </div>
|
|
|
+ </el-drawer>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
<div class="button-box">
|
|
|
<el-button type="primary" @click="makeSure">确认新增</el-button>
|
|
@@ -322,6 +366,30 @@ export default {
|
|
|
components: { PageTitle },
|
|
|
data() {
|
|
|
return {
|
|
|
+ //表格加载状态
|
|
|
+ ops: {
|
|
|
+ vuescroll: {},
|
|
|
+ scrollPanel: {},
|
|
|
+ rail: {
|
|
|
+ keepShow: true
|
|
|
+ },
|
|
|
+ bar: {
|
|
|
+ hoverStyle: true,
|
|
|
+ onlyShowBarOnScroll: false, //是否只有滚动的时候才显示滚动条
|
|
|
+ background: "#5f9ea0", //滚动条颜色
|
|
|
+ opacity: 0.8, //滚动条透明度
|
|
|
+ "overflow-x": "hidden"
|
|
|
+ }
|
|
|
+ },
|
|
|
+ PriceDrawer:false,
|
|
|
+ tableLoading: false,
|
|
|
+ isKuang:false,
|
|
|
+ priceOptions: {
|
|
|
+ requestUrl: ""
|
|
|
+ },
|
|
|
+ inputP:"",
|
|
|
+ drawerP:false,
|
|
|
+ //--
|
|
|
aaadrawer: false,
|
|
|
disabled: false,
|
|
|
options6: [
|
|
@@ -497,6 +565,25 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
+ funcP(){
|
|
|
+ this.isKuang = false;
|
|
|
+ this.tableLoading = false;
|
|
|
+ },
|
|
|
+ onpriceSelect(){
|
|
|
+ if (this.inputP == null) {
|
|
|
+ this.priceOptions.requestUrl =
|
|
|
+ "/api/v1/ams/getInwardContractPrice?apiId=464&deleted=0&i=" + new Date();
|
|
|
+ } else {
|
|
|
+ this.priceOptions.requestUrl =
|
|
|
+ "/api/v1/ams/getInwardContractPrice?apiId=464&deleted=0&con=" +
|
|
|
+ this.inputP;
|
|
|
+ }
|
|
|
+ },
|
|
|
+ onprice(){
|
|
|
+ this.drawerP=true;
|
|
|
+ this.priceOptions.requestUrl =
|
|
|
+ "/api/v1/ams/getInwardContractPrice?apiId=464&deleted=0&i=" + new Date();
|
|
|
+ },
|
|
|
//用车单位弹出层
|
|
|
handleSelectCarrier(item) {
|
|
|
this.shipperId = item.shipperId
|
|
@@ -800,6 +887,11 @@ export default {
|
|
|
// console.log("进来了");
|
|
|
// console.log(this.whether);
|
|
|
// console.log(this.installremark);
|
|
|
+ if (this.capacityTypeName == null || this.capacityTypeName == "") {
|
|
|
+ this.$message.warning('车辆类型必填')
|
|
|
+ this.disabled = false
|
|
|
+ return
|
|
|
+ }
|
|
|
if (this.tableData.length > 1 && this.form.requirementType != '倒库') {
|
|
|
this.$message.warning('非倒库需求只允许填写一个物资')
|
|
|
return
|
|
@@ -879,6 +971,11 @@ export default {
|
|
|
DueTime = sjTime(this.DueTime)
|
|
|
}
|
|
|
}
|
|
|
+ if (this.capacityTypeName == null || this.capacityTypeName == "") {
|
|
|
+ this.$message.warning('车辆类型必填')
|
|
|
+ this.disabled = false
|
|
|
+ return
|
|
|
+ }
|
|
|
if (this.form.capacityType == undefined) {
|
|
|
this.form.capacityType = ''
|
|
|
}
|