Browse Source

Merge remote-tracking branch 'origin/master'

master
God 1 year ago
parent
commit
b28349bfa7
  1. 124
      anrui-buscenter/anrui-finmanage-ui/src/components/publicPage/salesOrder.vue
  2. 167
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/publicPage/salesOrder.vue
  3. 167
      anrui-riskcenter-ui/src/components/publicPage/salesOrder.vue
  4. 167
      anrui-riskcenter-ui/src/views/workFlow/publicPage/salesOrder.vue
  5. 167
      anrui-scm/anrui-scm-ui/src/components/publicPage/saleOrder.vue
  6. 390
      anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseAdd.vue
  7. 11
      anrui-scm/anrui-scm-ui/src/views/guache/guachechuku/traileroutAdd.vue
  8. 11
      anrui-scm/anrui-scm-ui/src/views/guache/guachechuku/traileroutInfo.vue
  9. 167
      anrui-scm/anrui-scm-ui/src/views/workFlow/publicPage/xiaoshoudingdanInfo.vue

124
anrui-buscenter/anrui-finmanage-ui/src/components/publicPage/salesOrder.vue

@ -130,51 +130,127 @@
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.quantity }}</span></el-form-item>
</el-col>
</el-row>
<!-- <div class="title">挂车信息</div>-->
<!-- <el-row>-->
<!-- <el-col :span="24">-->
<!-- <el-form-item><span></span></el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<div class="title">价格信息</div>
<div class="title">价格信息(不含挂车)</div>
<el-row>
<el-col :span="8">
<div class="span-sty">单台整体指导价</div>
<el-col :span="6">
<div class="span-sty">销售指导价(/)</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.singleGuildPrice }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">主车单台销售合同价</div>
<el-col :span="6">
<div class="span-sty">销售合同价(/)</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.singleFinalPrice }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">其中主车或底盘()</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderModel.finalPrice }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">单台整体销售合同价</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.singleFinalPrice }}</span></el-form-item>
<el-col :span="6">
<div class="span-sty">其中上装()</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderModel.topPrice }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">单台折让()</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.bigDecimalSing }}</span></el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<div class="span-sty">台数</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.quantity }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">车价合计</div>
<el-col :span="6">
<div class="span-sty">车价合计()</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.priceSum }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">单台折让()</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.bigDecimalSing }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty">计划提车日期</div>
<el-col :span="6">
<div class="span-sty">计提车日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.plannedPickUpDate }}</span></el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="18">
<div class="span-sty">预计提车地点</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.plannedPickUpLocation }}</span></el-form-item>
</el-col>
</el-row>
<div v-if="formobj.isGc">
<div class="title">挂车<span v-show="formobj.gc2.singleFinalPrice !== '' && formobj.gc2.singleFinalPrice !== null">1</span>(对应单台主车)</div>
<el-row>
<el-col :span="6">
<div class="span-sty">挂车类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc1.trailerTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">外廓尺寸-(m)</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc1.appearanceSizeLong }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">销售合同价(/)</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc1.singleFinalPrice }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">数量</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc1.trailerCount }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">合同</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.gc1.contractFile" :key="index" :src="item" :preview-src-list="formobj.gc1.contractFile" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">同车型合格证</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.gc1.certFile" :key="index" :src="item" :preview-src-list="formobj.gc1.certFile" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注说明</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc1.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div v-show="formobj.gc2.singleFinalPrice !== '' && formobj.gc2.singleFinalPrice !== null">
<div class="title">挂车2(对应单台主车)</div>
<el-row>
<el-col :span="6">
<div class="span-sty">挂车类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc2.trailerTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">外廓尺寸-(m)</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc2.appearanceSizeLong }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">销售合同价(/)</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc2.singleFinalPrice }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">数量</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc2.trailerCount }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">合同</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.gc2.contractFile" :key="index" :src="item" :preview-src-list="formobj.gc2.contractFile" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">同车型合格证</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.gc2.certFile" :key="index" :src="item" :preview-src-list="formobj.gc2.certFile" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注说明</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc2.remarks }}</span></el-form-item>
</el-col>
</el-row>
</div>
</div>
<div class="title">订金信息</div>
<el-row>
<el-col :span="12">

167
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/publicPage/salesOrder.vue

@ -130,51 +130,127 @@
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.quantity }}</span></el-form-item>
</el-col>
</el-row>
<!-- <div class="title">挂车信息</div>-->
<!-- <el-row>-->
<!-- <el-col :span="24">-->
<!-- <el-form-item><span></span></el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<div class="title">价格信息</div>
<div class="title">价格信息(不含挂车)</div>
<el-row>
<el-col :span="8">
<div class="span-sty">单台整体指导价</div>
<el-col :span="6">
<div class="span-sty">销售指导价(/)</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.singleGuildPrice }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">主车单台销售合同价</div>
<el-col :span="6">
<div class="span-sty">销售合同价(/)</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.singleFinalPrice }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">其中主车或底盘()</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderModel.finalPrice }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">单台整体销售合同价</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.singleFinalPrice }}</span></el-form-item>
<el-col :span="6">
<div class="span-sty">其中上装()</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderModel.topPrice }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">单台折让()</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.bigDecimalSing }}</span></el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<div class="span-sty">台数</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.quantity }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">车价合计</div>
<el-col :span="6">
<div class="span-sty">车价合计()</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.priceSum }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">单台折让()</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.bigDecimalSing }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty">计划提车日期</div>
<el-col :span="6">
<div class="span-sty">计提车日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.plannedPickUpDate }}</span></el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="18">
<div class="span-sty">预计提车地点</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.plannedPickUpLocation }}</span></el-form-item>
</el-col>
</el-row>
<div v-if="formobj.isGc">
<div class="title">挂车<span v-show="formobj.gc2.singleFinalPrice !== '' && formobj.gc2.singleFinalPrice !== null">1</span>(对应单台主车)</div>
<el-row>
<el-col :span="6">
<div class="span-sty">挂车类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc1.trailerTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">外廓尺寸-(m)</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc1.appearanceSizeLong }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">销售合同价(/)</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc1.singleFinalPrice }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">数量</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc1.trailerCount }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">合同</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.gc1.contractFile" :key="index" :src="item" :preview-src-list="formobj.gc1.contractFile" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">同车型合格证</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.gc1.certFile" :key="index" :src="item" :preview-src-list="formobj.gc1.certFile" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注说明</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc1.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div v-show="formobj.gc2.singleFinalPrice !== '' && formobj.gc2.singleFinalPrice !== null">
<div class="title">挂车2(对应单台主车)</div>
<el-row>
<el-col :span="6">
<div class="span-sty">挂车类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc2.trailerTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">外廓尺寸-(m)</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc2.appearanceSizeLong }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">销售合同价(/)</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc2.singleFinalPrice }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">数量</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc2.trailerCount }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">合同</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.gc2.contractFile" :key="index" :src="item" :preview-src-list="formobj.gc2.contractFile" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">同车型合格证</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.gc2.certFile" :key="index" :src="item" :preview-src-list="formobj.gc2.certFile" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注说明</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc2.remarks }}</span></el-form-item>
</el-col>
</el-row>
</div>
</div>
<div class="title">订金信息</div>
<el-row>
<el-col :span="12">
@ -336,15 +412,17 @@ export default {
billingType: '',
billingTypeKey: '',
busDepositFictitiousList: [],
busSalesOrderDeposit: [],
busSalesOrderDeposit: {},
busSalesOrderDiscountList: [],
busSalesOrderInsurance: [],
busSalesOrderMakeup: [],
busSalesOrderModel: [],
busSalesOrderPrice: [],
busSalesOrderInsurance: {},
busSalesOrderMakeup: {},
busSalesOrderModel: {},
busSalesOrderPrice: {},
busSalesOrderVehicleList: [],
busSalesOrderotherMessageDetailsVo: [],
busSalesOrderotherMessageDetailsVo: {},
busSalesVehicleOrderList: [],
gc1: {},
gc2: {},
companyInvoicingName: '',
concatNo: '',
createDate: '',
@ -355,6 +433,7 @@ export default {
insuranceInfoMessage: '',
isInsurance: '',
isTop: '',
isGc: false,
licensePlateKey: '',
licensePlateValue: '',
mobile: '',
@ -392,6 +471,34 @@ export default {
} else {
this.formobj.busSalesOrderModel.vinNo = ''
}
if (this.formobj.gc1.contractFile.length > 0) {
const aa = []
this.formobj.gc1.contractFile.forEach((e) => {
aa.push(e.url)
})
this.formobj.gc1.contractFile = aa
}
if (this.formobj.gc1.certFile.length > 0) {
const bb = []
this.formobj.gc1.certFile.forEach((e) => {
bb.push(e.url)
})
this.formobj.gc1.certFile = bb
}
if (this.formobj.gc2.contractFile.length > 0) {
const cc = []
this.formobj.gc2.contractFile.forEach((e) => {
cc.push(e.url)
})
this.formobj.gc2.contractFile = cc
}
if (this.formobj.gc2.certFile.length > 0) {
const ee = []
this.formobj.gc2.certFile.forEach((e) => {
ee.push(e.url)
})
this.formobj.gc2.certFile = ee
}
}
})
},

167
anrui-riskcenter-ui/src/components/publicPage/salesOrder.vue

@ -130,51 +130,127 @@
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.quantity }}</span></el-form-item>
</el-col>
</el-row>
<!-- <div class="title">挂车信息</div>-->
<!-- <el-row>-->
<!-- <el-col :span="24">-->
<!-- <el-form-item><span></span></el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<div class="title">价格信息</div>
<div class="title">价格信息(不含挂车)</div>
<el-row>
<el-col :span="8">
<div class="span-sty">单台整体指导价</div>
<el-col :span="6">
<div class="span-sty">销售指导价(/)</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.singleGuildPrice }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">主车单台销售合同价</div>
<el-col :span="6">
<div class="span-sty">销售合同价(/)</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.singleFinalPrice }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">其中主车或底盘()</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderModel.finalPrice }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">单台整体销售合同价</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.singleFinalPrice }}</span></el-form-item>
<el-col :span="6">
<div class="span-sty">其中上装()</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderModel.topPrice }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">单台折让()</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.bigDecimalSing }}</span></el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<div class="span-sty">台数</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.quantity }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">车价合计</div>
<el-col :span="6">
<div class="span-sty">车价合计()</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.priceSum }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">单台折让()</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.bigDecimalSing }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty">计划提车日期</div>
<el-col :span="6">
<div class="span-sty">计提车日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.plannedPickUpDate }}</span></el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="18">
<div class="span-sty">预计提车地点</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.plannedPickUpLocation }}</span></el-form-item>
</el-col>
</el-row>
<div v-if="formobj.isGc">
<div class="title">挂车<span v-show="formobj.gc2.singleFinalPrice !== '' && formobj.gc2.singleFinalPrice !== null">1</span>(对应单台主车)</div>
<el-row>
<el-col :span="6">
<div class="span-sty">挂车类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc1.trailerTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">外廓尺寸-(m)</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc1.appearanceSizeLong }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">销售合同价(/)</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc1.singleFinalPrice }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">数量</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc1.trailerCount }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">合同</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.gc1.contractFile" :key="index" :src="item" :preview-src-list="formobj.gc1.contractFile" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">同车型合格证</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.gc1.certFile" :key="index" :src="item" :preview-src-list="formobj.gc1.certFile" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注说明</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc1.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div v-show="formobj.gc2.singleFinalPrice !== '' && formobj.gc2.singleFinalPrice !== null">
<div class="title">挂车2(对应单台主车)</div>
<el-row>
<el-col :span="6">
<div class="span-sty">挂车类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc2.trailerTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">外廓尺寸-(m)</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc2.appearanceSizeLong }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">销售合同价(/)</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc2.singleFinalPrice }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">数量</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc2.trailerCount }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">合同</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.gc2.contractFile" :key="index" :src="item" :preview-src-list="formobj.gc2.contractFile" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">同车型合格证</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.gc2.certFile" :key="index" :src="item" :preview-src-list="formobj.gc2.certFile" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注说明</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc2.remarks }}</span></el-form-item>
</el-col>
</el-row>
</div>
</div>
<div class="title">订金信息</div>
<el-row>
<el-col :span="12">
@ -336,15 +412,17 @@ export default {
billingType: '',
billingTypeKey: '',
busDepositFictitiousList: [],
busSalesOrderDeposit: [],
busSalesOrderDeposit: {},
busSalesOrderDiscountList: [],
busSalesOrderInsurance: [],
busSalesOrderMakeup: [],
busSalesOrderModel: [],
busSalesOrderPrice: [],
busSalesOrderInsurance: {},
busSalesOrderMakeup: {},
busSalesOrderModel: {},
busSalesOrderPrice: {},
busSalesOrderVehicleList: [],
busSalesOrderotherMessageDetailsVo: [],
busSalesOrderotherMessageDetailsVo: {},
busSalesVehicleOrderList: [],
gc1: {},
gc2: {},
companyInvoicingName: '',
concatNo: '',
createDate: '',
@ -355,6 +433,7 @@ export default {
insuranceInfoMessage: '',
isInsurance: '',
isTop: '',
isGc: false,
licensePlateKey: '',
licensePlateValue: '',
mobile: '',
@ -392,6 +471,34 @@ export default {
} else {
this.formobj.busSalesOrderModel.vinNo = ''
}
if (this.formobj.gc1.contractFile.length > 0) {
const aa = []
this.formobj.gc1.contractFile.forEach((e) => {
aa.push(e.url)
})
this.formobj.gc1.contractFile = aa
}
if (this.formobj.gc1.certFile.length > 0) {
const bb = []
this.formobj.gc1.certFile.forEach((e) => {
bb.push(e.url)
})
this.formobj.gc1.certFile = bb
}
if (this.formobj.gc2.contractFile.length > 0) {
const cc = []
this.formobj.gc2.contractFile.forEach((e) => {
cc.push(e.url)
})
this.formobj.gc2.contractFile = cc
}
if (this.formobj.gc2.certFile.length > 0) {
const ee = []
this.formobj.gc2.certFile.forEach((e) => {
ee.push(e.url)
})
this.formobj.gc2.certFile = ee
}
}
})
},

167
anrui-riskcenter-ui/src/views/workFlow/publicPage/salesOrder.vue

@ -130,51 +130,127 @@
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.quantity }}</span></el-form-item>
</el-col>
</el-row>
<!-- <div class="title">挂车信息</div>-->
<!-- <el-row>-->
<!-- <el-col :span="24">-->
<!-- <el-form-item><span></span></el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<div class="title">价格信息</div>
<div class="title">价格信息(不含挂车)</div>
<el-row>
<el-col :span="8">
<div class="span-sty">单台整体指导价</div>
<el-col :span="6">
<div class="span-sty">销售指导价(/)</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.singleGuildPrice }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">主车单台销售合同价</div>
<el-col :span="6">
<div class="span-sty">销售合同价(/)</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.singleFinalPrice }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">其中主车或底盘()</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderModel.finalPrice }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">单台整体销售合同价</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.singleFinalPrice }}</span></el-form-item>
<el-col :span="6">
<div class="span-sty">其中上装()</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderModel.topPrice }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">单台折让()</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.bigDecimalSing }}</span></el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<div class="span-sty">台数</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.quantity }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">车价合计</div>
<el-col :span="6">
<div class="span-sty">车价合计()</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.priceSum }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">单台折让()</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.bigDecimalSing }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty">计划提车日期</div>
<el-col :span="6">
<div class="span-sty">计提车日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.plannedPickUpDate }}</span></el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="18">
<div class="span-sty">预计提车地点</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.plannedPickUpLocation }}</span></el-form-item>
</el-col>
</el-row>
<div v-if="formobj.isGc">
<div class="title">挂车<span v-show="formobj.gc2.singleFinalPrice !== '' && formobj.gc2.singleFinalPrice !== null">1</span>(对应单台主车)</div>
<el-row>
<el-col :span="6">
<div class="span-sty">挂车类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc1.trailerTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">外廓尺寸-(m)</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc1.appearanceSizeLong }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">销售合同价(/)</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc1.singleFinalPrice }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">数量</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc1.trailerCount }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">合同</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.gc1.contractFile" :key="index" :src="item" :preview-src-list="formobj.gc1.contractFile" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">同车型合格证</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.gc1.certFile" :key="index" :src="item" :preview-src-list="formobj.gc1.certFile" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注说明</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc1.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div v-show="formobj.gc2.singleFinalPrice !== '' && formobj.gc2.singleFinalPrice !== null">
<div class="title">挂车2(对应单台主车)</div>
<el-row>
<el-col :span="6">
<div class="span-sty">挂车类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc2.trailerTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">外廓尺寸-(m)</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc2.appearanceSizeLong }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">销售合同价(/)</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc2.singleFinalPrice }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">数量</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc2.trailerCount }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">合同</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.gc2.contractFile" :key="index" :src="item" :preview-src-list="formobj.gc2.contractFile" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">同车型合格证</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.gc2.certFile" :key="index" :src="item" :preview-src-list="formobj.gc2.certFile" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注说明</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc2.remarks }}</span></el-form-item>
</el-col>
</el-row>
</div>
</div>
<div class="title">订金信息</div>
<el-row>
<el-col :span="12">
@ -336,15 +412,17 @@ export default {
billingType: '',
billingTypeKey: '',
busDepositFictitiousList: [],
busSalesOrderDeposit: [],
busSalesOrderDeposit: {},
busSalesOrderDiscountList: [],
busSalesOrderInsurance: [],
busSalesOrderMakeup: [],
busSalesOrderModel: [],
busSalesOrderPrice: [],
busSalesOrderInsurance: {},
busSalesOrderMakeup: {},
busSalesOrderModel: {},
busSalesOrderPrice: {},
busSalesOrderVehicleList: [],
busSalesOrderotherMessageDetailsVo: [],
busSalesOrderotherMessageDetailsVo: {},
busSalesVehicleOrderList: [],
gc1: {},
gc2: {},
companyInvoicingName: '',
concatNo: '',
createDate: '',
@ -355,6 +433,7 @@ export default {
insuranceInfoMessage: '',
isInsurance: '',
isTop: '',
isGc: false,
licensePlateKey: '',
licensePlateValue: '',
mobile: '',
@ -392,6 +471,34 @@ export default {
} else {
this.formobj.busSalesOrderModel.vinNo = ''
}
if (this.formobj.gc1.contractFile.length > 0) {
const aa = []
this.formobj.gc1.contractFile.forEach((e) => {
aa.push(e.url)
})
this.formobj.gc1.contractFile = aa
}
if (this.formobj.gc1.certFile.length > 0) {
const bb = []
this.formobj.gc1.certFile.forEach((e) => {
bb.push(e.url)
})
this.formobj.gc1.certFile = bb
}
if (this.formobj.gc2.contractFile.length > 0) {
const cc = []
this.formobj.gc2.contractFile.forEach((e) => {
cc.push(e.url)
})
this.formobj.gc2.contractFile = cc
}
if (this.formobj.gc2.certFile.length > 0) {
const ee = []
this.formobj.gc2.certFile.forEach((e) => {
ee.push(e.url)
})
this.formobj.gc2.certFile = ee
}
}
})
},

167
anrui-scm/anrui-scm-ui/src/components/publicPage/saleOrder.vue

@ -130,51 +130,127 @@
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.quantity }}</span></el-form-item>
</el-col>
</el-row>
<!-- <div class="title">挂车信息</div>-->
<!-- <el-row>-->
<!-- <el-col :span="24">-->
<!-- <el-form-item><span></span></el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<div class="title">价格信息</div>
<div class="title">价格信息(不含挂车)</div>
<el-row>
<el-col :span="8">
<div class="span-sty">单台整体指导价</div>
<el-col :span="6">
<div class="span-sty">销售指导价(/)</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.singleGuildPrice }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">主车单台销售合同价</div>
<el-col :span="6">
<div class="span-sty">销售合同价(/)</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.singleFinalPrice }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">其中主车或底盘()</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderModel.finalPrice }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">单台整体销售合同价</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.singleFinalPrice }}</span></el-form-item>
<el-col :span="6">
<div class="span-sty">其中上装()</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderModel.topPrice }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">单台折让()</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.bigDecimalSing }}</span></el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<div class="span-sty">台数</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.quantity }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">车价合计</div>
<el-col :span="6">
<div class="span-sty">车价合计()</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.priceSum }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">单台折让()</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.bigDecimalSing }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty">计划提车日期</div>
<el-col :span="6">
<div class="span-sty">计提车日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.plannedPickUpDate }}</span></el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="18">
<div class="span-sty">预计提车地点</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.plannedPickUpLocation }}</span></el-form-item>
</el-col>
</el-row>
<div v-if="formobj.isGc">
<div class="title">挂车<span v-show="formobj.gc2.singleFinalPrice !== '' && formobj.gc2.singleFinalPrice !== null">1</span>(对应单台主车)</div>
<el-row>
<el-col :span="6">
<div class="span-sty">挂车类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc1.trailerTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">外廓尺寸-(m)</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc1.appearanceSizeLong }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">销售合同价(/)</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc1.singleFinalPrice }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">数量</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc1.trailerCount }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">合同</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.gc1.contractFile" :key="index" :src="item" :preview-src-list="formobj.gc1.contractFile" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">同车型合格证</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.gc1.certFile" :key="index" :src="item" :preview-src-list="formobj.gc1.certFile" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注说明</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc1.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div v-show="formobj.gc2.singleFinalPrice !== '' && formobj.gc2.singleFinalPrice !== null">
<div class="title">挂车2(对应单台主车)</div>
<el-row>
<el-col :span="6">
<div class="span-sty">挂车类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc2.trailerTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">外廓尺寸-(m)</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc2.appearanceSizeLong }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">销售合同价(/)</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc2.singleFinalPrice }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">数量</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc2.trailerCount }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">合同</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.gc2.contractFile" :key="index" :src="item" :preview-src-list="formobj.gc2.contractFile" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">同车型合格证</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.gc2.certFile" :key="index" :src="item" :preview-src-list="formobj.gc2.certFile" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注说明</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc2.remarks }}</span></el-form-item>
</el-col>
</el-row>
</div>
</div>
<div class="title">订金信息</div>
<el-row>
<el-col :span="12">
@ -336,15 +412,17 @@ export default {
billingType: '',
billingTypeKey: '',
busDepositFictitiousList: [],
busSalesOrderDeposit: [],
busSalesOrderDeposit: {},
busSalesOrderDiscountList: [],
busSalesOrderInsurance: [],
busSalesOrderMakeup: [],
busSalesOrderModel: [],
busSalesOrderPrice: [],
busSalesOrderInsurance: {},
busSalesOrderMakeup: {},
busSalesOrderModel: {},
busSalesOrderPrice: {},
busSalesOrderVehicleList: [],
busSalesOrderotherMessageDetailsVo: [],
busSalesOrderotherMessageDetailsVo: {},
busSalesVehicleOrderList: [],
gc1: {},
gc2: {},
companyInvoicingName: '',
concatNo: '',
createDate: '',
@ -355,6 +433,7 @@ export default {
insuranceInfoMessage: '',
isInsurance: '',
isTop: '',
isGc: false,
licensePlateKey: '',
licensePlateValue: '',
mobile: '',
@ -392,6 +471,34 @@ export default {
} else {
this.formobj.busSalesOrderModel.vinNo = ''
}
if (this.formobj.gc1.contractFile.length > 0) {
const aa = []
this.formobj.gc1.contractFile.forEach((e) => {
aa.push(e.url)
})
this.formobj.gc1.contractFile = aa
}
if (this.formobj.gc1.certFile.length > 0) {
const bb = []
this.formobj.gc1.certFile.forEach((e) => {
bb.push(e.url)
})
this.formobj.gc1.certFile = bb
}
if (this.formobj.gc2.contractFile.length > 0) {
const cc = []
this.formobj.gc2.contractFile.forEach((e) => {
cc.push(e.url)
})
this.formobj.gc2.contractFile = cc
}
if (this.formobj.gc2.certFile.length > 0) {
const ee = []
this.formobj.gc2.certFile.forEach((e) => {
ee.push(e.url)
})
this.formobj.gc2.certFile = ee
}
}
})
},

390
anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseAdd.vue

@ -6,8 +6,7 @@
<div>{{ viewTitle }}</div>
<!--start 添加修改按钮-->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="dialogStatus === 'add' ? saveAdd() : saveEdit()">保存
</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="dialogStatus === 'add' ? saveAdd() : saveEdit()">保存</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
<!--end 添加修改按钮-->
@ -17,72 +16,66 @@
<!--Start 新增修改部分-->
<div class="listconadd">
<div class="titwu"><span>存放地点</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>使用组织</span>
</el-col>
<el-col :span="9">
<el-form-item prop="">
<el-input v-model="formobj.useOrg" placeholder="" class="addinputw" :disabled="true"/>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>编码</span>
</el-col>
<el-col :span="9">
<el-form-item prop="gressionCode">
<el-input v-model="formobj.gressionCode" placeholder="编码" class="addinputw" clearable/>
</el-form-item>
<el-col :span="24">
<el-form-item><span style="color: red">存放地点名称详细地址会在相关合同中显示请安要求认真填写</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>名称</span>
<el-col :span="12">
<div class="span-sty">使用组织</div>
<el-form-item><span class="addinputInfo">{{ formobj.useOrg }}</span></el-form-item>
</el-col>
<el-col :span="9">
<el-form-item prop="warehouseName">
<el-input v-model="formobj.warehouseName" placeholder="名称" class="addinputw" clearable/>
</el-form-item>
<el-col :span="12">
<div class="span-sty"><span class="icon">*</span>编码</div>
<el-form-item prop="gressionCode"><el-input v-model="formobj.gressionCode" placeholder="" class="addinputInfo addinputw" clearable /></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>负责人及电话</span>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty"><span class="icon">*</span>名称</div>
<el-form-item prop="warehouseName"><el-input v-model="formobj.warehouseName" placeholder="请填写存放地点营业执照上的公司全称" class="addinputInfo addinputw" clearable /></el-form-item>
</el-col>
<el-col :span="9">
<el-form-item prop="warehouseContract">
<el-input v-model="formobj.warehouseContract" placeholder="负责人及电话" class="addinputw" clearable/>
</el-form-item>
<el-col :span="12">
<div class="span-sty"><span class="icon">*</span>负责人及电话</div>
<el-form-item prop="warehouseContract"><el-input v-model="formobj.warehouseContract" placeholder="" class="addinputInfo addinputw" clearable /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>分组</span>
</el-col>
<el-col :span="9">
<el-col :span="12">
<div class="span-sty"><span class="icon">*</span>分组</div>
<el-form-item prop="warehouseGroupKey">
<el-select v-model="formobj.warehouseGroupKey" placeholder="请选择" @change="changeWarehouseGroup" clearable class="addinputw">
<el-option v-for="item in warehouseGroup_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
<el-select v-model="formobj.warehouseGroupKey" placeholder="请选择" @change="changeWarehouseGroup" clearable filterable class="addinputInfo">
<el-option v-for="item in warehouseGroup_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>库管人员</span>
</el-col>
<el-col :span="9">
<el-col :span="12">
<div class="span-sty"><span class="icon">*</span>库管人员</div>
<el-form-item prop="libTubeName">
<el-select v-model="formobj.libTubeName" placeholder="请选择" @change="changeLibTube" filterable clearable class="addinputw">
<el-option v-for="item in libTube_list" :key="item.userSid" :label="item.userName" :value="item.userName"/>
<el-select v-model="formobj.libTubeSid" placeholder="请选择" @change="changeLibTube" filterable clearable class="addinputInfo">
<el-option v-for="item in libTube_list" :key="item.userSid" :label="item.userName" :value="item.userSid" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>详细地址</span>
</el-col>
<el-col :span="21">
<el-col :span="24">
<div class="span-sty"><span class="icon">*</span>详细地址</div>
<el-form-item prop="warehouseAttribute">
<el-input v-model="formobj.warehouseAttribute" placeholder="详细地址" class="addinputw" clearable/>
<div class="addinputInfo" style="display: flex;flex-direction: row;justify-content: flex-start;align-items: center">
<el-select v-model="formobj.province" filterable clearable placeholder="请选择省" style="width:160px" @change="provinceChange">
<el-option v-for="item in province_list" :key="item.sid" :label="item.name" :value="item.name"/>
</el-select>
<el-select v-model="formobj.city" filterable placeholder="请选择市" style="width:160px" @change="cityChange">
<el-option v-for="item in city_list" :key="item.sid" :label="item.name" :value="item.name"/>
</el-select>
<el-select v-model="formobj.county" filterable placeholder="请选择县" style="width:160px" @change="countyChange">
<el-option v-for="item in county_list" :key="item.sid" :label="item.name" :value="item.name"/>
</el-select>
<el-input style="width: 30%" v-model="formobj.warehouseAttribute" clearable placeholder="请填写存放地点营业执照上的公司详细地址"/>
</div>
</el-form-item>
</el-col>
</el-row>
@ -95,6 +88,7 @@
<script>
import req from '@/api/anruiscm/scmwarehouse'
import { typeValues, getGressionUserList, getOrgSidByPath, fetchBySid } from '@/api/cheliang/dictcommons'
import { getProvince, getCity, getCounty } from '@/api/portal/areaPicker'
export default {
name: 'ScmWarehouseAdd',
@ -102,26 +96,10 @@ export default {
return {
viewTitle: '',
dialogStatus: 'add',
//
useOrg_list: [],
dataArr: [],
refreshItem: 0, // key
options: [], //
props: {
value: 'sid',
label: 'name',
children: 'children',
multiple: true
},
// ()
orgProps: {
value: 'sid',
label: 'name',
children: 'children',
checkStrictly: true
},
orgOptions: [],
orgArr: [],
submitdisabled: false,
province_list: [],
city_list: [],
county_list: [],
warehouseGroup_list: [],
libTube_list: [],
formobj: {
@ -136,25 +114,23 @@ export default {
warehouseGroupValue: '',
warehouseGroupKey: '',
libTubeName: '',
libTubeSid: ''
libTubeSid: '',
provinceSid: '',
province: '',
citySid: '',
city: '',
countySid: '',
county: ''
},
rules: {
useOrg: [{ required: true, message: '使用组织不能为空', trigger: 'change' }], // 使
useOrgSid: [{ required: true, message: '使用组织sid不能为空', trigger: 'blur' }], // 使sid
gressionCode: [{ required: true, message: '编码不能为空', trigger: 'blur' }], //
warehouseName: [{ required: true, message: '名称不能为空', trigger: 'blur' }], //
warehouseAttribute: [{ required: true, message: '存放地点详细地址不能为空', trigger: 'blur' }], //
warehouseContract: [{ required: true, message: '存放地点负责人不能为空', trigger: 'blur' }], //
warehouseContractSid: [{ required: true, message: '存放地点负责人sid不能为空', trigger: 'blur' }], // sid
warehouseGroupKey: [{ required: true, message: '分组不能为空', trigger: 'change' }], //
libTubeName: [{ required: true, message: '库管人员不能为空', trigger: 'change' }]
},
submitdisabled: false
}
},
created() {
this.getBuMen()
this.getOrg()
}
},
methods: {
//
@ -170,165 +146,47 @@ export default {
}
})
},
// ()
getOrg() {
req.getOrg().then((res) => {
if (res.success) {
this.useOrg_list = res.data
console.log('使用组织', this.useOrg_list)
}
})
},
useOrgChange(value) {
console.log('触发下拉框按钮', value)
let bb = null
this.useOrg_list.forEach((e) => {
if (e.name === value) {
bb = {
name: e.name,
key: e.id,
sid: e.sid
}
}
})
this.formobj.useOrg = bb.name
this.formobj.useOrgSid = bb.sid
console.log('name', this.formobj.useOrg, this.formobj.useOrgSid)
},
// org0(data) {
// data.forEach((e) => {
// if (e.children.length != 0) {
// this.org0(e.children)
// } else {
// delete e.children
// this.orgArr.push(e)
// return
// }
// })
// },
// -
getBuMen() {
req.salesDepName().then((res) => {
if (res.code === '200') {
this.options = res.data
console.log('请求到的级联列表', this.options)
this.BuMen0(this.options)
}
})
},
BuMen0(data) {
data.forEach((e) => {
if (e.children) {
if (e.children.length != 0) {
this.BuMen0(e.children)
provinceChange(value) {
const choose = this.province_list.filter((item) => item.name === value)
if (choose !== null && choose.length > 0) {
this.formobj.provinceSid = choose[0].sid
this.getCity(this.formobj.provinceSid)
} else {
delete e.children
this.dataArr.push(e)
return
this.formobj.provinceSid = ''
this.formobj.citySid = ''
this.formobj.city = ''
this.city_list = []
this.formobj.county = ''
this.formobj.countySid = ''
this.county_list = []
}
}
})
},
getType() {
typeValues({ type: 'locationGroup' }).then((res) => {
getCity(val) {
getCity({ sid: val }).then((res) => {
if (res.success) {
this.warehouseGroup_list = res.data
}
})
getGressionUserList({ userSid: window.sessionStorage.getItem('userSid'), orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
if (resp.success) {
this.libTube_list = resp.data
this.city_list = res.data
}
})
},
changeWarehouseGroup(val) {
if (val) {
const choosetItem = this.warehouseGroup_list.filter((item) => item.dictKey === val)
this.formobj.warehouseGroupValue = choosetItem[0].dictValue
console.log('name:', this.formobj.warehouseGroupValue, 'key:', this.formobj.warehouseGroupKey)
cityChange(value) {
const choose = this.city_list.filter((item) => item.name === value)
if (choose !== null && choose.length > 0) {
this.formobj.citySid = choose[0].sid
this.getCounty(this.formobj.citySid)
}
},
changeLibTube(value) {
let bb = null
this.libTube_list.forEach((e) => {
if (e.userName === value) {
bb = {
name: e.userName,
sid: e.userSid
}
getCounty(val) {
getCounty({ sid: val }).then((res) => {
if (res.success) {
this.county_list = res.data
}
})
this.formobj.libTubeSid = bb.sid
},
// //
// useOrgChange(e) {
// console.log('' + JSON.stringify(e))
// var result = ''
// var result_Sid = ''
// if (e.length > 0) {
// //
// e.forEach((item) => {
// var last_id = item[item.length - 1]
// //
// this.select_temp_Name = '' // ()
// this.select_temp_Sid = '' //(Sid)
// this.gainOrgId(last_id, this.orgOptions)
// result = result + this.select_temp_Name + ','
// result_Sid = result_Sid + this.select_temp_Sid + ','
// })
// }
// if (result !== '') {
// result = result.substring(0, result.length - 1)
// }
// if (result_Sid !== '') {
// result_Sid = result_Sid.substring(0, result_Sid.length - 1)
// }
// this.formobj.useOrg = result
// this.formobj.useOrgSid = result_Sid
// console.log('' + this.formobj.useOrg, this.formobj.useOrgSid)
// },
//
// // ---
// gainOrgId(id, orgOptions) {
// console.log('id', id)
// for (var i = 0; i < orgOptions.length; i++) {
// if (id == orgOptions[i].sid) {
// this.select_temp_Name = orgOptions[i].name //
// this.select_temp_Sid = orgOptions[i].sid
// return true
// } else {
// //
// if (orgOptions[i].children !== undefined) {
// //
// if (this.gainOrgId(id, orgOptions[i].children)) {
// return true
// }
// }
// }
// }
// },
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
sid: '',
useOrg: '', // 使
useOrgSid: '', // 使sid
gressionCode: '', //
warehouseName: '', //
warehouseAttribute: '', //
warehouseContract: '', //
warehouseContractSid: '', // sid
warehouseGroupValue: '',
warehouseGroupKey: '',
libTubeName: '',
libTubeSid: ''
countyChange(value) {
const choose = this.county_list.filter((item) => item.name === value)
if (choose !== null && choose.length > 0) {
this.formobj.countySid = choose[0].sid
}
this.$refs['form_obj'].resetFields()
this.$emit('doback')
},
showAdd() {
this.$nextTick(() => {
@ -354,19 +212,53 @@ export default {
})
this.getType()
},
getType() {
typeValues({ type: 'locationGroup' }).then((res) => {
if (res.success) {
this.warehouseGroup_list = res.data
}
})
getProvince().then((res) => {
if (res.success) {
this.province_list = res.data
}
})
getGressionUserList({ userSid: window.sessionStorage.getItem('userSid'), orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
if (resp.success) {
this.libTube_list = resp.data
}
})
},
changeWarehouseGroup(val) {
const choosetItem = this.warehouseGroup_list.filter((item) => item.dictKey === val)
if (choosetItem.length > 0 && choosetItem !== null) {
this.formobj.warehouseGroupValue = choosetItem[0].dictValue
} else {
this.formobj.warehouseGroupValue = ''
}
},
changeLibTube(value) {
const choosetItem = this.libTube_list.filter((item) => item.userSid === value)
if (choosetItem.length > 0 && choosetItem !== null) {
this.formobj.libTubeSid = choosetItem[0].userName
} else {
this.formobj.libTubeSid = ''
}
},
saveAdd() {
this.$refs['form_obj'].validate(valid => {
if (valid) {
this.submitdisabled = true
req.saveAdd(this.formobj).then(resp => {
this.submitdisabled = false
if (resp.success) {
this.$message({ showClose: true, type: 'success', message: resp.msg })
this.handleReturn('true')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
} else {
return false
}
})
},
@ -375,17 +267,44 @@ export default {
if (valid) {
this.submitdisabled = true
req.saveEdit(this.formobj, this.formobj.sid).then(resp => {
this.submitdisabled = false
if (resp.success) {
this.$message({ showClose: true, type: 'success', message: resp.msg })
this.handleReturn('true')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
} else {
return false
}
})
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
sid: '',
useOrg: '', // 使
useOrgSid: '', // 使sid
gressionCode: '', //
warehouseName: '', //
warehouseAttribute: '', //
warehouseContract: '', //
warehouseContractSid: '', // sid
warehouseGroupValue: '',
warehouseGroupKey: '',
libTubeName: '',
libTubeSid: '',
provinceSid: '',
province: '',
citySid: '',
city: '',
countySid: '',
county: ''
}
this.submitdisabled = false
this.$refs['form_obj'].resetFields()
this.$emit('doback')
},
}
}
</script>
@ -395,4 +314,17 @@ export default {
color: #e84026;
margin-right: 4px;
}
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important;
width: calc(100% - 115px);
}
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
</style>

11
anrui-scm/anrui-scm-ui/src/views/guache/guachechuku/traileroutAdd.vue

@ -104,7 +104,7 @@
<el-image v-for="(item, index) in formobj.hgzFiles" :key="index" :src="item" :preview-src-list="formobj.hgzFiles"/>
</el-dialog>
<!-- 查看销售订单 -->
<xiaoshoudingdanInfo v-show="viewState == 2" ref="divXiao" @doback="resetState"/>
<saleOrder v-show="viewState == 2" ref="divXiao" @doback="resetState"/>
<!-- 查看款票情况 -->
<paymentticket v-show="viewState == 3" ref="divPay" @doback="resetState"/>
</div>
@ -112,13 +112,13 @@
<script>
import req from '@/api/guache/guachechuku'
import xiaoshoudingdanInfo from '../../examinePage/chukushenhe/relation/xiaoshoudingdanInfo'
import saleOrder from '@/components/publicPage/saleOrder'
import paymentticket from '../../examinePage/chukushenhe/relation/paymentticket'
export default {
name: 'GuaCheChuKuAdd',
components: {
xiaoshoudingdanInfo,
saleOrder,
paymentticket
},
data() {
@ -194,11 +194,8 @@ export default {
}
},
handleXSDD() {
const parmas = {
sid: this.formobj.orderSid
}
this.viewState = 2
this.$refs['divXiao'].showInfo(parmas)
this.$refs['divXiao'].showInfo(this.formobj.orderSid)
},
handleKPQK() {
const kpqk = {

11
anrui-scm/anrui-scm-ui/src/views/guache/guachechuku/traileroutInfo.vue

@ -98,7 +98,7 @@
<el-image v-for="(item, index) in formobj.hgzFiles" :key="index" :src="item" :preview-src-list="formobj.hgzFiles"/>
</el-dialog>
<!-- 查看销售订单 -->
<xiaoshoudingdanInfo v-show="viewState == 2" ref="divXiao" @doback="resetState"/>
<saleOrder v-show="viewState == 2" ref="divXiao" @doback="resetState"/>
<!-- 查看款票情况 -->
<paymentticket v-show="viewState == 3" ref="divPay" @doback="resetState"/>
</div>
@ -106,13 +106,13 @@
<script>
import req from '@/api/guache/guachechuku'
import xiaoshoudingdanInfo from '../../examinePage/chukushenhe/relation/xiaoshoudingdanInfo'
import saleOrder from '@/components/publicPage/saleOrder'
import paymentticket from '../../examinePage/chukushenhe/relation/paymentticket'
export default {
name: 'GuaCheChuKuAdd',
components: {
xiaoshoudingdanInfo,
saleOrder,
paymentticket
},
data() {
@ -174,11 +174,8 @@ export default {
}
},
handleXSDD() {
const parmas = {
sid: this.formobj.orderSid
}
this.viewState = 2
this.$refs['divXiao'].showInfo(parmas)
this.$refs['divXiao'].showInfo(this.formobj.orderSid)
},
handleKPQK() {
const kpqk = {

167
anrui-scm/anrui-scm-ui/src/views/workFlow/publicPage/xiaoshoudingdanInfo.vue

@ -130,51 +130,127 @@
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.quantity }}</span></el-form-item>
</el-col>
</el-row>
<!-- <div class="title">挂车信息</div>-->
<!-- <el-row>-->
<!-- <el-col :span="24">-->
<!-- <el-form-item><span></span></el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<div class="title">价格信息</div>
<div class="title">价格信息(不含挂车)</div>
<el-row>
<el-col :span="8">
<div class="span-sty">单台整体指导价</div>
<el-col :span="6">
<div class="span-sty">销售指导价(/)</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.singleGuildPrice }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">主车单台销售合同价</div>
<el-col :span="6">
<div class="span-sty">销售合同价(/)</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.singleFinalPrice }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">其中主车或底盘()</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderModel.finalPrice }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">单台整体销售合同价</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.singleFinalPrice }}</span></el-form-item>
<el-col :span="6">
<div class="span-sty">其中上装()</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderModel.topPrice }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">单台折让()</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.bigDecimalSing }}</span></el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<div class="span-sty">台数</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.quantity }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">车价合计</div>
<el-col :span="6">
<div class="span-sty">车价合计()</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.priceSum }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">单台折让()</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.bigDecimalSing }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty">计划提车日期</div>
<el-col :span="6">
<div class="span-sty">计提车日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.plannedPickUpDate }}</span></el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="18">
<div class="span-sty">预计提车地点</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.plannedPickUpLocation }}</span></el-form-item>
</el-col>
</el-row>
<div v-if="formobj.isGc">
<div class="title">挂车<span v-show="formobj.gc2.singleFinalPrice !== '' && formobj.gc2.singleFinalPrice !== null">1</span>(对应单台主车)</div>
<el-row>
<el-col :span="6">
<div class="span-sty">挂车类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc1.trailerTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">外廓尺寸-(m)</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc1.appearanceSizeLong }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">销售合同价(/)</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc1.singleFinalPrice }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">数量</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc1.trailerCount }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">合同</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.gc1.contractFile" :key="index" :src="item" :preview-src-list="formobj.gc1.contractFile" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">同车型合格证</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.gc1.certFile" :key="index" :src="item" :preview-src-list="formobj.gc1.certFile" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注说明</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc1.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div v-show="formobj.gc2.singleFinalPrice !== '' && formobj.gc2.singleFinalPrice !== null">
<div class="title">挂车2(对应单台主车)</div>
<el-row>
<el-col :span="6">
<div class="span-sty">挂车类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc2.trailerTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">外廓尺寸-(m)</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc2.appearanceSizeLong }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">销售合同价(/)</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc2.singleFinalPrice }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">数量</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc2.trailerCount }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">合同</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.gc2.contractFile" :key="index" :src="item" :preview-src-list="formobj.gc2.contractFile" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">同车型合格证</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.gc2.certFile" :key="index" :src="item" :preview-src-list="formobj.gc2.certFile" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注说明</div>
<el-form-item><span class="addinputInfo">{{ formobj.gc2.remarks }}</span></el-form-item>
</el-col>
</el-row>
</div>
</div>
<div class="title">订金信息</div>
<el-row>
<el-col :span="12">
@ -336,15 +412,17 @@ export default {
billingType: '',
billingTypeKey: '',
busDepositFictitiousList: [],
busSalesOrderDeposit: [],
busSalesOrderDeposit: {},
busSalesOrderDiscountList: [],
busSalesOrderInsurance: [],
busSalesOrderMakeup: [],
busSalesOrderModel: [],
busSalesOrderPrice: [],
busSalesOrderInsurance: {},
busSalesOrderMakeup: {},
busSalesOrderModel: {},
busSalesOrderPrice: {},
busSalesOrderVehicleList: [],
busSalesOrderotherMessageDetailsVo: [],
busSalesOrderotherMessageDetailsVo: {},
busSalesVehicleOrderList: [],
gc1: {},
gc2: {},
companyInvoicingName: '',
concatNo: '',
createDate: '',
@ -355,6 +433,7 @@ export default {
insuranceInfoMessage: '',
isInsurance: '',
isTop: '',
isGc: false,
licensePlateKey: '',
licensePlateValue: '',
mobile: '',
@ -392,6 +471,34 @@ export default {
} else {
this.formobj.busSalesOrderModel.vinNo = ''
}
if (this.formobj.gc1.contractFile.length > 0) {
const aa = []
this.formobj.gc1.contractFile.forEach((e) => {
aa.push(e.url)
})
this.formobj.gc1.contractFile = aa
}
if (this.formobj.gc1.certFile.length > 0) {
const bb = []
this.formobj.gc1.certFile.forEach((e) => {
bb.push(e.url)
})
this.formobj.gc1.certFile = bb
}
if (this.formobj.gc2.contractFile.length > 0) {
const cc = []
this.formobj.gc2.contractFile.forEach((e) => {
cc.push(e.url)
})
this.formobj.gc2.contractFile = cc
}
if (this.formobj.gc2.certFile.length > 0) {
const ee = []
this.formobj.gc2.certFile.forEach((e) => {
ee.push(e.url)
})
this.formobj.gc2.certFile = ee
}
}
})
},

Loading…
Cancel
Save