Browse Source

Merge remote-tracking branch 'origin/master'

master
God 11 months ago
parent
commit
84936c4761
  1. 263
      anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/dingdanInfo.vue
  2. 278
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/dingdanInfo.vue
  3. 171
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdan.vue
  4. 171
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue
  5. 171
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue
  6. 171
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanInfo.vue
  7. 171
      anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdanInfo.vue
  8. 4
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/ScheduledLoanFundDayService.java
  9. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpushfundhistory/LoanPushFundHistoryService.java
  10. 20
      yxt-as-ui/src/api/Common/dictcommons.js
  11. 107
      yxt-as-ui/src/api/operation/claimadjustment.js
  12. 13
      yxt-as-ui/src/api/operation/claimpendingverification.js
  13. 44
      yxt-as-ui/src/api/storage/adjustment.js
  14. 2
      yxt-as-ui/src/api/storage/stocktaking.js
  15. 2
      yxt-as-ui/src/api/warehouse/warehouseArea.js
  16. 34
      yxt-as-ui/src/router/index.js
  17. 7
      yxt-as-ui/src/views/maintenance/maintenanceOutbound/index.vue
  18. 327
      yxt-as-ui/src/views/operation/claimadjustment/claimadjustment.vue
  19. 338
      yxt-as-ui/src/views/operation/claimadjustment/claimadjustmentAdd.vue
  20. 170
      yxt-as-ui/src/views/operation/claimadjustment/claimadjustmentInfo.vue
  21. 242
      yxt-as-ui/src/views/operation/claimpendingverification/claimpendingverification.vue
  22. 265
      yxt-as-ui/src/views/storage/adjustment/adjustmentAdd.vue
  23. 155
      yxt-as-ui/src/views/storage/adjustment/adjustmentInfo.vue
  24. 363
      yxt-as-ui/src/views/storage/adjustment/index.vue
  25. 181
      yxt-as-ui/src/views/storage/adjustment/relation/choosecategory.vue
  26. 176
      yxt-as-ui/src/views/storage/adjustment/relation/editPriceStrategy.vue
  27. 54
      yxt-as-ui/src/views/storage/maintenanceInOrOutBound/maintenanceReturnBoundInfo.vue
  28. 12
      yxt-as-ui/src/views/storage/receivingGoods/index.vue
  29. 46
      yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue
  30. 36
      yxt-as-ui/src/views/warehouse/goodsShelves/goodsShelvesAdd.vue
  31. 431
      yxt-as-ui/src/views/workFlow/suopeitiaozhengFlow/claimadjustmentDaiBan.vue
  32. 282
      yxt-as-ui/src/views/workFlow/suopeitiaozhengFlow/claimadjustmentEdit.vue
  33. 217
      yxt-as-ui/src/views/workFlow/suopeitiaozhengFlow/claimadjustmentYiBan.vue
  34. 12
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java
  35. 10
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDetailsVo.java
  36. 10
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDto.java
  37. 1
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailSDto.java
  38. 3
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillMapper.xml
  39. 2
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillRest.java
  40. 5
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java
  41. 27
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.xml
  42. 11
      yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseRackRest.java
  43. 27
      yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsGoodsTagRest.java
  44. 22
      yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsShelfBillRest.java
  45. 20
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsHouseInfoVo.java
  46. 1
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRack.java
  47. 2
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.java
  48. 3
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.xml
  49. 83
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackService.java
  50. 45
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTag.java
  51. 17
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagMapper.java
  52. 8
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagMapper.xml
  53. 19
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagService.java
  54. 2
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillInventoryQuery.java
  55. 1
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillMapper.xml
  56. 8
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillService.java
  57. 89
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java
  58. 3
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBill.java
  59. 3
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillMapper.java
  60. 15
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillMapper.xml
  61. 261
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java
  62. 43
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/app/AppSaveBillRecordDto.java
  63. 44
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/app/AppScanVo.java
  64. 29
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/app/AppShelInitVo.java
  65. 43
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/app/AppShelfBillListVo.java
  66. 7
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetailMapper.java
  67. 20
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetailMapper.xml
  68. 13
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetailService.java

263
anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/dingdanInfo.vue

@ -133,57 +133,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-row>
<el-row>
<el-col :span="12">
<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">
<div class="span-sty">计提车地点</div>
<el-col :span="6">
<div class="span-sty">提车地点</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.plannedPickUpLocation }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">保险说明</div>
<el-row>
<el-col :span="24">
<el-form-item><span>{{ formobj.insuranceInfo }}</span></el-form-item>
<div class="span-sty">单台折让()</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.bigDecimalSing }}</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">
@ -217,6 +287,53 @@
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderDeposit.depositRemarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">中介返利</div>
<el-row>
<el-col :span="12">
<div class="span-sty">内部引荐人</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderotherMessageDetailsVo.name }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">返利备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderotherMessageDetailsVo.remarks }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<div class="span-sty">中介人1</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderotherMessageDetailsVo.distributorName }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">联系电话</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderotherMessageDetailsVo.distributorMobile }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">单车中介返利</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderotherMessageDetailsVo.distributorPrice }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">中介返利合计</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderotherMessageDetailsVo.middleOneDistributorPriceTotal }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<div class="span-sty">中介人2</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderotherMessageDetailsVo.distributorNameTwo }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">联系电话</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderotherMessageDetailsVo.distributorMobileTwo }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">单车中介返利</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderotherMessageDetailsVo.distributorPriceTwo }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">中介返利合计</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderotherMessageDetailsVo.middleTwoDistributorPriceTotal }}</span></el-form-item>
</el-col>
</el-row>
<div class="title" v-if="formobj.busSalesOrderDiscountList.length > 0">优惠套餐</div>
<el-table v-if="formobj.busSalesOrderDiscountList.length > 0" :key="tableKey" :data="formobj.busSalesOrderDiscountList" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
@ -263,51 +380,10 @@
<el-form-item><el-image style="width: 178px;height: 178px;" v-for="(item,index) in formobj.images" :key="index" :src="item" :preview-src-list="formobj.images"></el-image></el-form-item>
</el-col>
</el-row>
<div class="title">其它信息</div>
<el-row>
<el-col :span="12">
<div class="span-sty">内部引荐人</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderotherMessageDetailsVo.name }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">返利备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderotherMessageDetailsVo.remarks }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<div class="span-sty">中介人1</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderotherMessageDetailsVo.distributorName }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">联系电话</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderotherMessageDetailsVo.distributorMobile }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">单车中介服务费</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderotherMessageDetailsVo.distributorPrice }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">中介服务费合计</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderotherMessageDetailsVo.middleOneDistributorPriceTotal }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">保险说明</div>
<el-row>
<el-col :span="6">
<div class="span-sty">中介人2</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderotherMessageDetailsVo.distributorNameTwo }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">联系电话</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderotherMessageDetailsVo.distributorMobileTwo }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">单车中介服务费</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderotherMessageDetailsVo.distributorPriceTwo }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">中介服务费合计</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderotherMessageDetailsVo.middleTwoDistributorPriceTotal }}</span></el-form-item>
<el-col :span="24">
<el-form-item><span>{{ formobj.insuranceInfo }}</span></el-form-item>
</el-col>
</el-row>
</el-form>
@ -344,15 +420,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: '',
@ -363,6 +441,7 @@ export default {
insuranceInfoMessage: '',
isInsurance: '',
isTop: '',
isGc: false,
licensePlateKey: '',
licensePlateValue: '',
mobile: '',
@ -400,6 +479,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
}
}
})
},

278
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/dingdanInfo.vue

@ -130,57 +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-row>
<el-row>
<el-col :span="12">
<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">
<div class="span-sty">计提车地点</div>
<el-col :span="6">
<div class="span-sty">提车地点</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.plannedPickUpLocation }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">保险说明</div>
<el-row>
<el-col :span="24">
<el-form-item><span>{{ formobj.insuranceInfo }}</span></el-form-item>
<div class="span-sty">单台折让()</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.bigDecimalSing }}</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">
@ -214,6 +284,53 @@
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderDeposit.depositRemarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">中介返利</div>
<el-row>
<el-col :span="12">
<div class="span-sty">内部引荐人</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderotherMessageDetailsVo.name }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">返利备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderotherMessageDetailsVo.remarks }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<div class="span-sty">中介人1</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderotherMessageDetailsVo.distributorName }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">联系电话</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderotherMessageDetailsVo.distributorMobile }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">单车中介返利</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderotherMessageDetailsVo.distributorPrice }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">中介返利合计</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderotherMessageDetailsVo.middleOneDistributorPriceTotal }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<div class="span-sty">中介人2</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderotherMessageDetailsVo.distributorNameTwo }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">联系电话</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderotherMessageDetailsVo.distributorMobileTwo }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">单车中介返利</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderotherMessageDetailsVo.distributorPriceTwo }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">中介返利合计</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderotherMessageDetailsVo.middleTwoDistributorPriceTotal }}</span></el-form-item>
</el-col>
</el-row>
<div class="title" v-if="formobj.busSalesOrderDiscountList.length > 0">优惠套餐</div>
<el-table v-if="formobj.busSalesOrderDiscountList.length > 0" :key="tableKey" :data="formobj.busSalesOrderDiscountList" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
@ -260,51 +377,10 @@
<el-form-item><el-image style="width: 178px;height: 178px;" v-for="(item,index) in formobj.images" :key="index" :src="item" :preview-src-list="formobj.images"></el-image></el-form-item>
</el-col>
</el-row>
<div class="title">其它信息</div>
<el-row>
<el-col :span="12">
<div class="span-sty">内部引荐人</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderotherMessageDetailsVo.name }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">返利备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderotherMessageDetailsVo.remarks }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<div class="span-sty">中介人1</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderotherMessageDetailsVo.distributorName }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">联系电话</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderotherMessageDetailsVo.distributorMobile }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">单车中介服务费</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderotherMessageDetailsVo.distributorPrice }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">中介服务费合计</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderotherMessageDetailsVo.middleOneDistributorPriceTotal }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">保险说明</div>
<el-row>
<el-col :span="6">
<div class="span-sty">中介人2</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderotherMessageDetailsVo.distributorNameTwo }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">联系电话</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderotherMessageDetailsVo.distributorMobileTwo }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">单车中介服务费</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderotherMessageDetailsVo.distributorPriceTwo }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">中介服务费合计</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderotherMessageDetailsVo.middleTwoDistributorPriceTotal }}</span></el-form-item>
<el-col :span="24">
<el-form-item><span>{{ formobj.insuranceInfo }}</span></el-form-item>
</el-col>
</el-row>
</el-form>
@ -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
}
}
})
},
@ -450,15 +557,17 @@ export default {
billingType: '',
billingTypeKey: '',
busDepositFictitiousList: [],
busSalesOrderDeposit: [],
busSalesOrderDeposit: {},
busSalesOrderDiscountList: [],
busSalesOrderInsurance: [],
busSalesOrderMakeup: [],
busSalesOrderModel: [],
busSalesOrderPrice: [],
busSalesOrderInsurance: {},
busSalesOrderMakeup: {},
busSalesOrderModel: {},
busSalesOrderPrice: {},
busSalesOrderVehicleList: [],
busSalesOrderotherMessageDetailsVo: [],
busSalesOrderotherMessageDetailsVo: {},
busSalesVehicleOrderList: [],
gc1: {},
gc2: {},
concatNo: '',
createDate: '',
customerName: '',
@ -468,6 +577,7 @@ export default {
insuranceInfoMessage: '',
isInsurance: '',
isTop: '',
isGc: false,
licensePlateKey: '',
licensePlateValue: '',
mobile: '',

171
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdan.vue

@ -134,51 +134,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-row>
<el-row>
<el-col :span="12">
<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">
<div class="span-sty">计提车地点</div>
<el-col :span="6">
<div class="span-sty">提车地点</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.plannedPickUpLocation }}</span></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.busSalesOrderPrice.bigDecimalSing }}</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">
@ -383,15 +459,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: '',
@ -402,6 +480,7 @@ export default {
insuranceInfoMessage: '',
isInsurance: '',
isTop: '',
isGc: false,
licensePlateKey: '',
licensePlateValue: '',
mobile: '',
@ -502,6 +581,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
}
}
})
selectStaffListss().then((res) => {

171
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue

@ -134,51 +134,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-row>
<el-row>
<el-col :span="12">
<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">
<div class="span-sty">计提车地点</div>
<el-col :span="6">
<div class="span-sty">提车地点</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.plannedPickUpLocation }}</span></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.busSalesOrderPrice.bigDecimalSing }}</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">
@ -405,15 +481,17 @@ export default {
billingType: '',
billingTypeKey: '',
busDepositFictitiousList: [],
busSalesOrderDeposit: [],
busSalesOrderDeposit: {},
busSalesOrderDiscountList: [],
busSalesOrderInsurance: [],
busSalesOrderMakeup: [],
busSalesOrderModel: [],
busSalesOrderPrice: [],
busSalesOrderInsurance: {},
busSalesOrderMakeup: {},
busSalesOrderModel: {},
busSalesOrderPrice: {},
busSalesOrderVehicleList: [],
busSalesOrderotherMessageDetailsVo: [],
busSalesOrderotherMessageDetailsVo: {},
busSalesVehicleOrderList: [],
gc1: {},
gc2: {},
concatNo: '',
createDate: '',
customerName: '',
@ -423,6 +501,7 @@ export default {
insuranceInfoMessage: '',
isInsurance: '',
isTop: '',
isGc: false,
licensePlateKey: '',
licensePlateValue: '',
mobile: '',
@ -531,6 +610,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
}
getInvoicingList({ orgPath: this.formobj.orgSidPath }).then((res) => {
if (res.success) {
this.companyInvoicing_list = res.data

171
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue

@ -134,51 +134,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-row>
<el-row>
<el-col :span="12">
<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">
<div class="span-sty">计提车地点</div>
<el-col :span="6">
<div class="span-sty">提车地点</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.plannedPickUpLocation }}</span></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.busSalesOrderPrice.bigDecimalSing }}</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">
@ -405,15 +481,17 @@ export default {
billingType: '',
billingTypeKey: '',
busDepositFictitiousList: [],
busSalesOrderDeposit: [],
busSalesOrderDeposit: {},
busSalesOrderDiscountList: [],
busSalesOrderInsurance: [],
busSalesOrderMakeup: [],
busSalesOrderModel: [],
busSalesOrderPrice: [],
busSalesOrderInsurance: {},
busSalesOrderMakeup: {},
busSalesOrderModel: {},
busSalesOrderPrice: {},
busSalesOrderVehicleList: [],
busSalesOrderotherMessageDetailsVo: [],
busSalesOrderotherMessageDetailsVo: {},
busSalesVehicleOrderList: [],
gc1: {},
gc2: {},
concatNo: '',
createDate: '',
customerName: '',
@ -423,6 +501,7 @@ export default {
insuranceInfoMessage: '',
isInsurance: '',
isTop: '',
isGc: false,
licensePlateKey: '',
licensePlateValue: '',
mobile: '',
@ -531,6 +610,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
}
getInvoicingList({ orgPath: this.formobj.orgSidPath }).then((res) => {
if (res.success) {
this.companyInvoicing_list = res.data

171
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/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-row>
<el-row>
<el-col :span="12">
<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">
<div class="span-sty">计提车地点</div>
<el-col :span="6">
<div class="span-sty">提车地点</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.plannedPickUpLocation }}</span></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.busSalesOrderPrice.bigDecimalSing }}</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">
@ -335,15 +411,17 @@ export default {
billingType: '',
billingTypeKey: '',
busDepositFictitiousList: [],
busSalesOrderDeposit: [],
busSalesOrderDeposit: {},
busSalesOrderDiscountList: [],
busSalesOrderInsurance: [],
busSalesOrderMakeup: [],
busSalesOrderModel: [],
busSalesOrderPrice: [],
busSalesOrderInsurance: {},
busSalesOrderMakeup: {},
busSalesOrderModel: {},
busSalesOrderPrice: {},
busSalesOrderVehicleList: [],
busSalesOrderotherMessageDetailsVo: [],
busSalesOrderotherMessageDetailsVo: {},
busSalesVehicleOrderList: [],
gc1: {},
gc2: {},
concatNo: '',
companyInvoicingName: '',
createDate: '',
@ -354,6 +432,7 @@ export default {
insuranceInfoMessage: '',
isInsurance: '',
isTop: '',
isGc: false,
licensePlateKey: '',
licensePlateValue: '',
mobile: '',
@ -426,6 +505,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
}
}
})
},

171
anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/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-row>
<el-row>
<el-col :span="12">
<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">
<div class="span-sty">计提车地点</div>
<el-col :span="6">
<div class="span-sty">提车地点</div>
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.plannedPickUpLocation }}</span></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.busSalesOrderPrice.bigDecimalSing }}</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
}
}
})
},

4
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/ScheduledLoanFundDayService.java

@ -40,7 +40,7 @@ public class ScheduledLoanFundDayService {
* 每天晚上12点遍历还款计划表中的公司垫款余额按照以下规则计算
* 每笔垫款的累计资金占用费用A金融应收未收表中
* 截止到当天垫款余额在还款计划表中T 当天新增的资金占用费B
* A=A+BB =T*7/10000
* A=A+BB =T*10/10000
* 需要建立每日资金占用费记录表还款计划明细表sid日期当日垫款余额当日资金占用费
*/
//查询
@ -55,7 +55,7 @@ public class ScheduledLoanFundDayService {
//截止到当天垫款余额T
BigDecimal paymentMoneyAll = list.get(i).getPaymentMoney();
//当天资金占用费B
BigDecimal fundDay = paymentMoneyAll.multiply(new BigDecimal("7")).divide(new BigDecimal("10000"),2, RoundingMode.HALF_UP);
BigDecimal fundDay = paymentMoneyAll.multiply(new BigDecimal("10")).divide(new BigDecimal("10000"),2, RoundingMode.HALF_UP);
LoanRepaymentPlanDetails loanRepaymentPlanDetails = list.get(i);
LoanFundDay loanFundDay = new LoanFundDay();
loanFundDay.setBusSid(loanRepaymentPlanDetails.getSid());

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpushfundhistory/LoanPushFundHistoryService.java

@ -126,7 +126,7 @@ public class LoanPushFundHistoryService extends MybatisBaseService<LoanPushFundH
String finalPath = "";
Map<String, Object> dataMap = new HashMap();
List<Map<String, Object>> newList = new ArrayList<>();
dataMap.put("percent", "日万");
dataMap.put("percent", "日万");
String useOrgSid = "";
ResultBean<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(orgPath);
if (orgSidByPath.getSuccess()) {

20
yxt-as-ui/src/api/Common/dictcommons.js

@ -8,6 +8,15 @@ export function typeValues(data) {
})
}
// 获取数据字典(根据分组)
export function getTypeValueList(data) {
return request({
url: '/portal/v1/dictcommons/getTypeValueList',
method: 'get',
params: data
})
}
// 根据当前登录人orgSidPath(全路径sid)查询分公司
export function getOrgSidByPath(data) {
return request({
@ -182,3 +191,14 @@ export function getAsBusrepairBill(params) {
}
})
}
// 查询分页列表 --商品类别列表
export function getGoodsCategory(params) {
return request({
url: '/as/v1/AsBusrepairBill/listPage',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
}

107
yxt-as-ui/src/api/operation/claimadjustment.js

@ -0,0 +1,107 @@
import request from '@/utils/request'
export default {
// 查询分页列表
listPage: function(params) {
return request({
url: '/as/v1/AsBusclaimCheckApply/listPage',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
// 初始化
fetchDetailsBySid: function(data) {
return request({
url: '/as/v1/AsBusclaimCheckApply/details',
method: 'get',
params: data
})
},
saveOrUpdate: function(data) {
return request({
url: '/as/v1/AsBusclaimCheckApply/saveOrUpdateBill',
method: 'post',
data: data,
headers: { 'Content-Type': 'application/json' }
})
},
deleteBySids: function(data) {
return request({
url: '/as/v1/AsBusclaimCheckApply/delBySids',
method: 'DELETE',
data: data,
headers: { 'Content-Type': 'application/json' }
})
},
// 提交流程
submit: function(params) {
return request({
url: '/as/v1/AsBusclaimCheckApply/submitApply',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
// 流程审批(同意)
complete: function(params) {
return request({
url: '/as/v1/AsBusclaimCheckApply/complete',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
// 流程审批(加签)
delegate: function(params) {
return request({
url: '/as/v1/AsBusclaimCheckApply/delegate',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
// 流程审批(驳回)
reject: function(params) {
return request({
url: '/as/v1/AsBusclaimCheckApply/reject',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
// 流程审批(终止)
breakProcess: function(params) {
return request({
url: '/as/v1/AsBusclaimCheckApply/breakProcess',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
// 流程审批(撤回)
revokeProcess: function(params) {
return request({
url: '/as/v1/AsBusclaimCheckApply/revokeProcess',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
// 审批流程(同意)获取下一环节
getNextNodesForSubmit: function(data) {
return request({
url: '/as/v1/AsBusclaimCheckApply/getNextNodesForSubmit',
method: 'get',
params: data
})
},
// 审批流程(驳回)获取上一环节
getPreviousNodesForReject: function(data) {
return request({
url: '/as/v1/AsBusclaimCheckApply/getPreviousNodesForReject',
method: 'get',
params: data
})
}
}

13
yxt-as-ui/src/api/operation/claimpendingverification.js

@ -0,0 +1,13 @@
import request from '@/utils/request'
export default {
// 查询分页列表
listPage: function (params) {
return request({
url: '/as/v1/AsBusclaimCheck/listPage',
method: 'post',
data: params,
headers: {'Content-Type': 'application/json'}
})
}
}

44
yxt-as-ui/src/api/storage/adjustment.js

@ -0,0 +1,44 @@
import request from '@/utils/request'
export default {
// 查询分页列表
listPage: function(params) {
return request({
url: '/wms/apiadmin/WmsShelfBill/listPage',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
// 初始化
init: function(data) {
return request({
url: '/wms/apiadmin/WmsShelfBill/details?sid='+data,
method: 'get'
});
},
// 新增、保存
save: function(data) {
return request({
url: '/wms/apiadmin/WmsShelfBill/saveOrUpdate',
method: 'post',
data: data,
headers: { 'Content-Type': 'application/json' }
});
},
deleteBySids: function(data) {
return request({
url: '/wms/apiadmin/WmsShelfBill/delBySids',
method: 'DELETE',
data: data,
headers: { 'Content-Type': 'application/json' }
})
},
}

2
yxt-as-ui/src/api/storage/stocktaking.js

@ -5,7 +5,7 @@ export default {
// 查询分页列表
listPage: function(params) {
return request({
url: '/wms/apiadmin/inventory/wmsinventorycheckbill/listPage',
url: '/wms/v1/wmsinventorycheckbill/listPage',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }

2
yxt-as-ui/src/api/warehouse/warehouseArea.js

@ -32,7 +32,7 @@ export default {
return request({
url: '/wms/apiadmin/base/wmswarehousearea/selectAll',
method: 'get',
params: data,
params: params,
headers: { 'Content-Type': 'application/json' }
})
},

34
yxt-as-ui/src/router/index.js

@ -116,6 +116,18 @@ export const constantRoutes = [{
name: 'ClaimBilling',
meta: { title: '索赔单开票管理', noCache: true }
},
{
path: '/claimpendingverification/claimpendingverification',
component: () => import('@/views/operation/claimpendingverification/claimpendingverification.vue'),
name: 'ClaimPendingVerification',
meta: { title: '工单索赔待核对', noCache: true }
},
{
path: '/claimadjustment/claimadjustment',
component: () => import('@/views/operation/claimadjustment/claimadjustment.vue'),
name: 'ClaimAdjustment',
meta: { title: '工单索赔调整', noCache: true }
},
{
path: '/workslrsettlement/workslrsettlement',
component: () => import('@/views/operation/workslrsettlement/workslrsettlement.vue'),
@ -249,6 +261,7 @@ export const constantRoutes = [{
name: 'InventoryRefer',
meta: { title: '出入库查询', noCache: true }
},
{ path: '/adjustment/index', component: () => import('@/views/storage/adjustment/index.vue'), name: 'Adjustment', meta: { title: '定/调价', noCache: true } },
{
path: '/maintenanceInOrOutBound/index',
component: () => import('@/views/storage/maintenanceInOrOutBound/index.vue'),
@ -580,6 +593,27 @@ export const constantRoutes = [{
import('@/views/workFlow/suopeikaipiaoFlow/claimbillingYiBan.vue'),
name: 'ClaimBillingYiBan'
},
// 工单索赔调整--编辑
{
path: '/suopeitiaozhengFlow/claimadjustmentEdit',
component: () =>
import('@/views/workFlow/suopeitiaozhengFlow/claimadjustmentEdit.vue'),
name: 'ClaimAdjustmentEdit'
},
// 工单索赔调整--待办
{
path: '/suopeitiaozhengFlow/claimadjustmentDaiBan',
component: () =>
import('@/views/workFlow/suopeitiaozhengFlow/claimadjustmentDaiBan.vue'),
name: 'ClaimAdjustmentDaiBan'
},
// 工单索赔调整--已办
{
path: '/suopeitiaozhengFlow/claimadjustmentYiBan',
component: () =>
import('@/views/workFlow/suopeitiaozhengFlow/claimadjustmentYiBan.vue'),
name: 'ClaimAdjustmentYiBan'
},
// 404 page must be placed at the end !!!
// { path: '*', redirect: '/404', hidden: true }
]

7
yxt-as-ui/src/views/maintenance/maintenanceOutbound/index.vue

@ -300,8 +300,6 @@
total: 0,
params: {
name: '',
inOrg: "",
outOrg: ""
}
},
commodityData: [],
@ -505,7 +503,7 @@
commodityInput(row) {
console.log("commodityInput》》》》", row)
this.commodityQuery.params.name = row.goodsSpuName
this.commodityQuery.params.busrepairBillsid = row.sitemSid
this.commodityQuery.params.busrepairBillsid = row.sourceBillSid
this.commodityLoading = true
req.getGoodsListPage(this.commodityQuery).then((response) => {
if (response.success) {
@ -524,6 +522,7 @@
console.log("commodityCurrentChange》》》》", row)
row.inventorySid = value.inventorySid
row.goodsID = value.goodsID
row.goodSpuSid = value.goodSpuSid
row.goodsSpuName = value.goodsSpuName
row.goodsSkuSid = value.goodsSkuSid
@ -547,6 +546,8 @@
addGoods(row) {
var goods = {
"sourceBillNo": this.formobj.sourceBillNo,
"sourceBillSid": this.formobj.sourceBillSid,
"sitemSid": row.serviceItemSid,
'serviceItem': row.serviceItem,
"inventorySid": "",

327
yxt-as-ui/src/views/operation/claimadjustment/claimadjustment.vue

@ -0,0 +1,327 @@
<template>
<div class="app-container">
<!--列表页面-->
<div v-show="viewState == 1">
<button-bar view-title="工单索赔调整申请管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<!--Start查询列表部分-->
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-form-item label="分公司">
<el-input v-model="listQuery.params.useOrgName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="申请部门">
<el-input v-model="listQuery.params.deptName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="申请人">
<el-input v-model="listQuery.params.createByName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="单据编号">
<el-input v-model="listQuery.params.billNo" placeholder="" clearable/>
</el-form-item>
<el-form-item label="申请日期">
<el-date-picker v-model="listQuery.params.createTimeStart" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.createTimeEnd" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
</el-form-item>
<el-form-item label="办结日期">
<el-date-picker v-model="listQuery.params.closeDateStart" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.closeDateEnd" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" size="small" @click="handleReset">重置</el-button>
</div>
</div>
</div>
<!--End查询列表部分-->
<div class="listtop">
<div class="tit">索赔单列表</div>
<pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
<!--Start 主页面主要部分 -->
<div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;" @selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="50" />
<el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
<el-table-column label="操作" width="180" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="toEdit(scope.row)" :disabled="scope.row.nodeState =='发起申请' ? false : scope.row.nodeState == '待提交' ? false : true">办理</el-button>
<el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column label="流程状态" width="180" header-align="center">
<template slot-scope="scope">
<span v-if="scope.row.nodeState=='待提交'" type="primary" size="mini">待提交</span>
<span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
</template>
</el-table-column>
<el-table-column prop="billNo" label="单据编号" align="center" width="160" />
<el-table-column prop="useOrgName" label="分公司" align="center" min-width="120" />
<el-table-column prop="deptName" label="申请部门" align="center" min-width="120" />
<el-table-column prop="createByName" label="申请人" align="center" width="120" />
<el-table-column prop="createTime" label="申请日期" align="center" width="120" />
<el-table-column prop="closeDate" label="办结日期" align="center" width="120" />
</el-table>
</div>
<!--End 主页面主要部分-->
<div class="pages">
<div class="tit"/>
<!-- 翻页 -->
<pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
<!--End查询列表部分-->
</div>
</div>
<!--新增及修改 -->
<claimadjustmentAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="getList" />
<!-- 详情 -->
<claimadjustmentInfo v-show="viewState == 4" ref="divInfo" @doback="resetState" />
<!-- 流程审批记录 -->
<el-dialog title="" :visible.sync="centerDialogVisible" width="78%" height="1%" :before-close="closeIt" center>
<iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no" :src="this.centerDialogVisible === true ? url :''"></iframe>
</el-dialog>
</div>
</template>
<script>
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import req from '@/api/operation/claimadjustment'
import { getStorage } from '@/utils/auth'
import claimadjustmentAdd from './claimadjustmentAdd'
import claimadjustmentInfo from './claimadjustmentInfo'
export default {
name: 'ClaimAdjustment',
components: {
Pagination,
pageye,
ButtonBar,
claimadjustmentAdd,
claimadjustmentInfo
},
data() {
return {
url: '',
dialogHeight: '80%',
centerDialogVisible: false,
btndisabled: false,
btnList: [
{
type: 'danger',
size: 'small',
icon: 'del',
btnKey: 'doDel',
btnLabel: '删除'
},
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
isSearchShow: false,
searchxianshitit: '显示查询条件',
viewState: 1, // 1 2 3 4
tableKey: 0,
list: [],
sids: [], // SIDs
FormLoading: false,
listLoading: false,
//
listQuery: {
current: 1,
size: 5,
total: 0,
params: {
useOrgName: '',
deptName: '',
createByName: '',
billNo: '',
createTimeStart: '',
createTimeEnd: '',
closeDateStart: '',
closeDateEnd: '',
userSid: '',
orgPath: '',
menuUrl: ''
}
}
}
},
created() {
//
this.getList()
},
mounted() {
// vuewindowpostMessagehandleMessage
window.addEventListener('message', this.handleMessage)
this.$refs['btnbar'].setButtonList(this.btnList)
},
methods: {
async handleMessage(event) {
var code = ''
if (event.data.params !== null && event.data.params !== undefined) {
code = event.data.params.code
}
if (code === 1) {
this.centerDialogVisible = false
} else if (code === 2) {
this.dialogHeight = event.data.params.data
this.setIframeHeight(document.getElementById('iframe'))
}
},
closeIt() {
this.url = ''
this.centerDialogVisible = false
},
setIframeHeight(iframe) {
iframe.height = this.dialogHeight
},
flowRecord(row) {
this.centerDialogVisible = true
var params = {
deployId: row.procDefId,
procInsId: row.procInstId,
token: getStorage()
}
this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
},
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
btnHandle(btnKey) {
console.log('XXXXXXXXXXXXXXX ' + btnKey)
switch (btnKey) {
case 'doDel':
this.doDel()
break
case 'doClose':
this.doClose()
break
default:
break
}
},
// sid
handleSelectionChange(row) {
const aa = []
row.forEach(element => {
aa.push(element.sid)
})
this.sids = aa
},
//
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
},
//
getList() {
this.listLoading = true
this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
this.listQuery.params.menuUrl = this.$route.path
this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
req.listPage(this.listQuery).then((response) => {
this.listLoading = false
if (response.success) {
this.list = response.data.records
this.listQuery.total = response.data.total
} else {
this.list = []
this.listQuery.total = 0
}
})
},
//
handleFilter() {
this.listQuery.current = 1
this.getList()
},
//
handleReset() {
this.listQuery = {
current: 1,
size: 5,
total: 0,
params: {
useOrgName: '',
deptName: '',
createByName: '',
billNo: '',
createTimeStart: '',
createTimeEnd: '',
closeDateStart: '',
closeDateEnd: '',
userSid: '',
orgPath: '',
menuUrl: ''
}
}
this.getList()
},
toEdit(row) {
this.viewState = 3
this.$refs['divAdd'].showEdit(row)
},
toInfo(row) {
this.viewState = 4
this.$refs['divInfo'].showInfo(row)
},
doDel() {
if (this.sids.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
return
}
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.deleteBySids(this.sids).then(resp => {
if (resp.success) {
this.$message({ type: 'success', message: resp.msg, showClose: true })
}
this.getList()
loading.close()
}).catch(e => {
loading.close()
})
}).catch(() => {
})
},
//
resetState() {
this.viewState = 1
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
}
}
}
</script>
<style scoped>
</style>

338
yxt-as-ui/src/views/operation/claimadjustment/claimadjustmentAdd.vue

@ -0,0 +1,338 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><el-input class="addinputInfo" style="width: 80%" v-model="formobj.remarks" clearable placeholder="" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">附件</div>
<el-form-item>
<uploadImg ref="uploadImg" class="addinputInfo" v-model="formobj.fileList" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
</el-form-item>
</el-col>
</el-row>
<div class="title">开票索赔单列表</div>
<el-table :key="tableKey" :data="formobj.detailsList" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="repairBillNo" label="维修工单号" align="center" width="170" />
<el-table-column prop="vehMark" label="车牌号" align="center" width="150" />
<el-table-column prop="vinNo" label="车架号" align="center" width="150" />
<el-table-column label="工单" align="center" width="120">
<el-table-column prop="hourAmount1" label="工时费" align="center" width="120" />
<el-table-column prop="goodsAmount1" label="材料费" align="center" width="120" />
<el-table-column prop="claimOutAmount1" label="外出费" align="center" width="120" />
<el-table-column prop="claimSubsidyAmount1" label="厂家补助" align="center" width="120" />
<el-table-column prop="claimOtherAmount1" label="其他费用" align="center" width="120" />
<el-table-column prop="all1" label="合计" align="center" width="120" />
</el-table-column>
<el-table-column label="索赔开票" align="center" width="120">
<el-table-column prop="claimHourAmount2" label="工时费" align="center" width="120" />
<el-table-column prop="claimGoodsAmount2" label="材料费" align="center" width="120" />
<el-table-column prop="claimOutAmount2" label="外出费" align="center" width="120" />
<el-table-column prop="claimSubsidyAmount2" label="厂家补助" align="center" width="120" />
<el-table-column prop="claimOtherAmount2" label="其他费用" align="center" width="120" />
<el-table-column prop="all2" label="合计" align="center" width="120" />
</el-table-column>
<el-table-column prop="all3" label="差异合计" align="center" width="120" />
<el-table-column label="差异调整" align="center" width="120">
<el-table-column label="工时费" align="center" width="150">
<template slot-scope="scope">
<el-input @input="jeTotal(scope.row)" @keyup.native="scope.row.claimHourAmount = getNumber(scope.row.claimHourAmount, 2)" v-model="scope.row.claimHourAmount" clearable placeholder="" />
</template>
</el-table-column>
<el-table-column label="材料费" align="center" width="150">
<template slot-scope="scope">
<el-input @input="jeTotal(scope.row)" @keyup.native="scope.row.claimGoodsAmount = getNumber(scope.row.claimGoodsAmount, 2)" v-model="scope.row.claimGoodsAmount" clearable placeholder="" />
</template>
</el-table-column>
<el-table-column label="外出费" align="center" width="150">
<template slot-scope="scope">
<el-input @input="jeTotal(scope.row)" @keyup.native="scope.row.claimOutAmount = getNumber(scope.row.claimOutAmount, 2)" v-model="scope.row.claimOutAmount" clearable placeholder="" />
</template>
</el-table-column>
<el-table-column label="厂家补助" align="center" width="150">
<template slot-scope="scope">
<el-input @input="jeTotal(scope.row)" @keyup.native="scope.row.claimSubsidyAmount = getNumber(scope.row.claimSubsidyAmount, 2)" v-model="scope.row.claimSubsidyAmount" clearable placeholder="" />
</template>
</el-table-column>
<el-table-column label="其他费用" align="center" min-width="150">
<template slot-scope="scope">
<el-input @input="jeTotal(scope.row)" @keyup.native="scope.row.claimOtherAmount = getNumber(scope.row.claimOtherAmount, 2)" v-model="scope.row.claimOtherAmount" clearable placeholder="" />
</template>
</el-table-column>
<el-table-column label="预留" align="center" min-width="150">
<template slot-scope="scope">
<el-input @input="jeTotal(scope.row)" @keyup.native="scope.row.reserved = getNumber(scope.row.reserved, 2)" v-model="scope.row.reserved" clearable placeholder="" />
</template>
</el-table-column>
<el-table-column prop="all4" label="合计" align="center" width="100" />
<el-table-column label="调整原因" align="center" width="100">
<template slot-scope="scope">
<el-select v-model="scope.row.reasonKey" placeholder="请选择" filterable clearable @change="reasonChange($event, scope.row)">
<el-option v-for="item in adjustmentReason_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
</el-option>
</el-select>
</template>
</el-table-column>
</el-table-column>
</el-table>
</el-form>
</div>
</div>
</div>
</template>
<script>
import req from '@/api/operation/claimadjustment'
import uploadImg from '@/components/uploadFile/uploadImg'
import { getOrgSidByPath, typeValues } from '@/api/Common/dictcommons'
export default {
name: 'ClaimAdjustmentAdd',
components: {
uploadImg
},
data() {
return {
viewTitle: '',
viewState: 1,
submitdisabled: false,
tableKey: 1,
index: 0,
adjustmentReason_list: [],
formobj: {
sid: '',
createBySid: '',
createByName: '',
orgPath: '',
createTime: '',
deptSid: '',
deptName: '',
fileList: [],
remarks: '',
billNo: '',
createOrgSid: '',
useOrgSid: '',
useOrgName: '',
closeDate: '',
procInstId: '',
procDefId: '',
taskId: '',
taskDefKey: '',
nodeState: '',
detailsList: []
},
rules: {}
}
},
methods: {
init() {
typeValues({ type: 'adjustmentReason' }).then((res) => {
if (res.success) {
this.adjustmentReason_list = res.data
}
})
},
getNumber(val, limit) {
val = val.replace(/[^0-9.]/g, '') //
val = val.replace(/^00/, '0.') // 0
val = val.replace(/^\./g, '0.') // 0.
val = val.replace(/\.{2,}/g, '.') //
val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); //
/^0\d+/.test(val) ? val = val.slice(1) : '' // 0
const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
const reg = new RegExp(str)
if (limit === 0) {
//
val = val.replace(reg, '$1')
} else {
//
val = val.replace(reg, '$1.$2')
}
return val
},
showAdd(list) {
this.viewTitle = '【新增】工单索赔调整申请'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.init()
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
this.formobj.createOrgSid = res.data
this.formobj.useOrgSid = res.data
}
})
this.formobj.createByName = window.sessionStorage.getItem('name')
this.formobj.createBySid = window.sessionStorage.getItem('userSid')
this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)
var nowDate = new Date()
var date = {
year: nowDate.getFullYear(),
month: nowDate.getMonth() + 1,
day: nowDate.getDate()
}
list = JSON.parse(JSON.stringify(list))
console.log(list, 9999)
this.formobj.createTime = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day)
list.forEach((e) => {
console.log(Math.round((parseFloat(e.claimHourAmount2) - parseFloat(e.hourAmount1) * 100) / 100), 88888)
this.formobj.detailsList.push({
claimBillNo: '',
repairBillNo: e.repairBillNo,
vehMark: e.vehMark,
vinNo: e.vinNo,
billInvoiceDetailSid: e.billInvoiceDetailSid,
billInvoiceSid: e.billInvoiceSid,
claimHourAmount: Math.round((parseFloat(e.claimHourAmount2) - parseFloat(e.hourAmount1)) * 100) / 100,
claimGoodsAmount: Math.round((parseFloat(e.claimGoodsAmount2) - parseFloat(e.goodsAmount1)) * 100) / 100,
claimOutAmount: Math.round((parseFloat(e.claimOutAmount2) - parseFloat(e.claimOutAmount1)) * 100) / 100,
claimSubsidyAmount: Math.round((parseFloat(e.claimSubsidyAmount2) - parseFloat(e.claimSubsidyAmount1)) * 100) / 100,
claimOtherAmount: Math.round((parseFloat(e.claimOtherAmount2) - parseFloat(e.claimOtherAmount1)) * 100) / 100,
reserved: '',
reasonKey: '',
reasonValue: '',
hourAmount1: e.hourAmount1,
goodsAmount1: e.goodsAmount1,
claimOutAmount1: e.claimOutAmount1,
claimSubsidyAmount1: e.claimSubsidyAmount1,
claimOtherAmount1: e.claimOtherAmount1,
all1: e.all1,
claimHourAmount2: e.claimHourAmount2,
claimGoodsAmount2: e.claimGoodsAmount2,
claimOutAmount2: e.claimOutAmount2,
claimSubsidyAmount2: e.claimSubsidyAmount2,
claimOtherAmount2: e.claimOtherAmount2,
all2: e.all2,
all3: e.all3,
all4: e.all3
})
})
},
showEdit(row) {
this.viewTitle = '【编辑】工单索赔调整申请'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.init()
req.fetchDetailsBySid({ sid: row.sid }).then((res) => {
if (res.success) {
this.formobj = res.data
this.formobj.instanceId = res.data.procInstId
}
})
},
//
jeTotal(row) {
row.all4 = Math.round((parseFloat(row.claimHourAmount === '' ? '0' : row.claimHourAmount) + parseFloat(row.claimGoodsAmount === '' ? '0' : row.claimGoodsAmount) + parseFloat(row.claimOutAmount === '' ? '0' : row.claimOutAmount) + parseFloat(row.claimSubsidyAmount === '' ? '0' : row.claimSubsidyAmount) + parseFloat(row.claimOtherAmount === '' ? '0' : row.claimOtherAmount) - parseFloat(row.reserved === '' ? '0' : row.reserved)) * 100) / 100
},
reasonChange(value, row) {
const choose = this.adjustmentReason_list.filter((item) => item.dictKey === value)
if (choose.length > 0 && choose !== null) {
row.reasonValue = choose[0].dictValue
} else {
row.reasonValue = ''
}
},
saveOrUpdate() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
req.saveOrUpdate(this.formobj).then((res) => {
if (res.success) {
this.$message({ showClose: true, type: 'success', message: '保存成功' })
this.handleReturn('true')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
}
})
},
submit() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
req.submit(this.formobj).then((res) => {
if (res.success) {
this.$message({ showClose: true, type: 'success', message: '提交成功' })
this.handleReturn('true')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
}
})
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
sid: '',
createBySid: '',
createByName: '',
orgPath: '',
createTime: '',
deptSid: '',
deptName: '',
fileList: [],
remarks: '',
billNo: '',
createOrgSid: '',
useOrgSid: '',
useOrgName: '',
closeDate: '',
procInstId: '',
procDefId: '',
taskId: '',
taskDefKey: '',
nodeState: '',
detailsList: []
}
this.submitdisabled = false
this.$emit('doback')
}
}
}
</script>
<style scoped>
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
</style>

170
yxt-as-ui/src/views/operation/claimadjustment/claimadjustmentInfo.vue

@ -0,0 +1,170 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></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.remarks }}</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.fileList" :key="index" :src="item" :preview-src-list="formobj.fileList" /></el-form-item>
</el-col>
</el-row>
<div class="title">开票索赔单列表</div>
<el-table :key="tableKey" :data="formobj.detailsList" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="repairBillNo" label="维修工单号" align="center" width="170"/>
<el-table-column prop="vehMark" label="车牌号" align="center" width="150"/>
<el-table-column prop="vinNo" label="车架号" align="center" width="150"/>
<el-table-column label="工单" align="center" width="120">
<el-table-column prop="hourAmount1" label="工时费" align="center" width="120"/>
<el-table-column prop="goodsAmount1" label="材料费" align="center" width="120"/>
<el-table-column prop="claimOutAmount1" label="外出费" align="center" width="120"/>
<el-table-column prop="claimSubsidyAmount1" label="厂家补助" align="center" width="120"/>
<el-table-column prop="claimOtherAmount1" label="其他费用" align="center" width="120"/>
<el-table-column prop="all1" label="合计" align="center" width="120"/>
</el-table-column>
<el-table-column label="索赔开票" align="center" width="120">
<el-table-column prop="claimHourAmount2" label="工时费" align="center" width="120"/>
<el-table-column prop="claimGoodsAmount2" label="材料费" align="center" width="120"/>
<el-table-column prop="claimOutAmount2" label="外出费" align="center" width="120"/>
<el-table-column prop="claimSubsidyAmount2" label="厂家补助" align="center" width="120"/>
<el-table-column prop="claimOtherAmount2" label="其他费用" align="center" width="120"/>
<el-table-column prop="all2" label="合计" align="center" width="120"/>
</el-table-column>
<el-table-column prop="all3" label="差异合计" align="center" width="120"/>
<el-table-column label="差异调整" align="center" width="120">
<el-table-column prop="claimHourAmount" label="工时费" align="center" width="150" />
<el-table-column prop="claimGoodsAmount" label="材料费" align="center" width="150" />
<el-table-column prop="claimOutAmount" label="外出费" align="center" width="150" />
<el-table-column prop="claimSubsidyAmount" label="厂家补助" align="center" width="150" />
<el-table-column prop="claimOtherAmount" label="其他费用" align="center" width="150" />
<el-table-column prop="reserved" label="预留" align="center" width="150" />
<el-table-column prop="all4" label="合计" align="center" width="150" />
<el-table-column prop="reasonValue" label="调整原因" align="center" width="150" />
</el-table-column>
</el-table>
</el-form>
</div>
</div>
</div>
</template>
<script>
import req from '@/api/operation/claimadjustment'
export default {
name: 'ClaimAdjustmentInfo',
data() {
return {
viewTitle: '',
viewState: 1,
tableKey: 1,
index: 0,
formobj: {
sid: '',
createBySid: '',
createByName: '',
orgPath: '',
createTime: '',
deptSid: '',
deptName: '',
fileList: [],
remarks: '',
billNo: '',
createOrgSid: '',
useOrgSid: '',
useOrgName: '',
closeDate: '',
procInstId: '',
procDefId: '',
taskId: '',
taskDefKey: '',
nodeState: '',
detailsList: []
},
rules: {}
}
},
methods: {
showInfo(row) {
this.viewTitle = '工单索赔调整申请详情'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
req.fetchDetailsBySid({ sid: row.sid }).then((res) => {
if (res.success) {
this.formobj = res.data
this.formobj.instanceId = res.data.procInstId
if (this.formobj.fileList.length > 0) {
const aa = []
this.formobj.fileList.forEach((e) => {
aa.push(e.url)
})
this.formobj.fileList = aa
}
}
})
},
handleReturn() {
this.formobj = {
sid: '',
createBySid: '',
createByName: '',
orgPath: '',
createTime: '',
deptSid: '',
deptName: '',
fileList: [],
remarks: '',
billNo: '',
createOrgSid: '',
useOrgSid: '',
useOrgName: '',
closeDate: '',
procInstId: '',
procDefId: '',
taskId: '',
taskDefKey: '',
nodeState: '',
detailsList: []
}
this.$emit('doback')
}
}
}
</script>
<style scoped>
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
</style>

242
yxt-as-ui/src/views/operation/claimpendingverification/claimpendingverification.vue

@ -0,0 +1,242 @@
<template>
<div class="app-container">
<!--列表页面-->
<div v-show="viewState == 1">
<button-bar view-title="工单索赔待核对管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<!--Start查询列表部分-->
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="110px" class="tab-header">
<el-form-item label="维修工单号">
<el-input v-model="listQuery.params.repairBillNo" placeholder="" clearable/>
</el-form-item>
<el-form-item label="差异金额范围">
<el-input v-model="listQuery.params.cyStartMoney" style="width: 160px" placeholder="" clearable/>
<span style="padding: 0 8px"></span>
<el-input v-model="listQuery.params.cyEndMoney" style="width: 160px" placeholder="" clearable/>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" size="small" @click="handleReset">重置</el-button>
</div>
</div>
</div>
<!--End查询列表部分-->
<div class="listtop">
<div class="tit">待核对维修工单列表</div>
<pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
<!--Start 主页面主要部分 -->
<div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;" @selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="50" />
<el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
<el-table-column prop="repairBillNo" label="维修工单号" align="center" width="170" />
<el-table-column prop="vehMark" label="车牌号" align="center" width="150" />
<el-table-column prop="vinNo" label="车架号" align="center" width="150" />
<el-table-column label="关联索赔单" align="center" width="150">
<el-table-column prop="count" label="关联索赔单数量" align="center" width="150" />
<el-table-column prop="count1" label="已开票索赔单数量" align="center" width="160" />
<el-table-column prop="count2" label="未开票索赔单数量" align="center" width="160" />
</el-table-column>
<el-table-column label="工单" align="center" width="120">
<el-table-column prop="hourAmount1" label="工时费" align="center" width="120" />
<el-table-column prop="goodsAmount1" label="材料费" align="center" width="120" />
<el-table-column prop="claimOutAmount1" label="外出费" align="center" width="120" />
<el-table-column prop="claimSubsidyAmount1" label="厂家补助" align="center" width="120" />
<el-table-column prop="claimOtherAmount1" label="其他费用" align="center" width="120" />
<el-table-column prop="all1" label="合计" align="center" width="120" />
</el-table-column>
<el-table-column label="索赔开票" align="center" width="120">
<el-table-column prop="claimHourAmount2" label="工时费" align="center" width="120" />
<el-table-column prop="claimGoodsAmount2" label="材料费" align="center" width="120" />
<el-table-column prop="claimOutAmount2" label="外出费" align="center" width="120" />
<el-table-column prop="claimSubsidyAmount2" label="厂家补助" align="center" width="120" />
<el-table-column prop="claimOtherAmount2" label="其他费用" align="center" width="120" />
<el-table-column prop="all2" label="合计" align="center" width="120" />
</el-table-column>
<el-table-column prop="all3" label="差异合计" align="center" width="120" />
</el-table>
</div>
<!--End 主页面主要部分-->
<div class="pages">
<div class="tit"/>
<!-- 翻页 -->
<pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
<!--End查询列表部分-->
</div>
</div>
<!-- 新建调差申请 -->
<claimadjustmentAdd v-show="viewState == 2" ref="divAdd" @doback="resetState" />
</div>
</template>
<script>
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import req from '@/api/operation/claimpendingverification'
import claimadjustmentAdd from '../claimadjustment/claimadjustmentAdd'
export default {
name: 'ClaimPendingVerification',
components: {
Pagination,
pageye,
ButtonBar,
claimadjustmentAdd
},
data() {
return {
btndisabled: false,
btnList: [
{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toAdd',
btnLabel: '新建调差申请'
},
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
isSearchShow: false,
searchxianshitit: '显示查询条件',
viewState: 1, // 1 2 3 4
tableKey: 0,
list: [],
sids: [], // SIDs
multipleSelection: [],
FormLoading: false,
listLoading: false,
//
listQuery: {
current: 1,
size: 5,
total: 0,
params: {
repairBillNo: '',
cyStartMoney: '',
cyEndMoney: '',
menuUrl: '',
userSid: '',
orgPath: ''
}
}
}
},
created() {
//
this.getList()
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
methods: {
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
btnHandle(btnKey) {
console.log('XXXXXXXXXXXXXXX ' + btnKey)
switch (btnKey) {
case 'toAdd':
this.toAdd()
break
case 'doClose':
this.doClose()
break
default:
break
}
},
// sid
handleSelectionChange(row) {
const aa = []
this.multipleSelection = row
row.forEach(element => {
aa.push(element.sid)
})
this.sids = aa
},
//
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
},
//
getList() {
this.listLoading = true
this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
this.listQuery.params.menuUrl = this.$route.path
this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
req.listPage(this.listQuery).then((response) => {
this.listLoading = false
if (response.success) {
this.list = response.data.records
this.listQuery.total = response.data.total
} else {
this.list = []
this.listQuery.total = 0
}
})
},
//
handleFilter() {
this.listQuery.current = 1
this.getList()
},
//
handleReset() {
this.listQuery = {
current: 1,
size: 5,
total: 0,
params: {
repairBillNo: '',
repairBillNo: '',
cyStartMoney: '',
cyEndMoney: '',
menuUrl: '',
userSid: '',
orgPath: ''
}
}
this.getList()
},
toAdd() {
if (this.multipleSelection.length > 0) {
this.viewState = 2
this.$refs['divAdd'].showAdd(this.multipleSelection)
} else {
this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行操作' })
}
},
//
resetState() {
this.viewState = 1
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
}
}
}
</script>
<style scoped>
</style>

265
yxt-as-ui/src/views/storage/adjustment/adjustmentAdd.vue

@ -0,0 +1,265 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
<!-- 标题 -->
<div>{{title}}定调价策略申请</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="submintdate">提交</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
<!-- end 添加修改按钮 -->
<!-- end 详情按钮 -->
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<!-- <div class="title">
<div>基础信息</div>
</div> -->
<el-row class="first_row">
<el-col :span="8">
<div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item> <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo"
type="textarea" :rows="4" clearable /></el-form-item>
</el-col>
</el-row>
<div class="title titleOne">
<div>商品类别列表</div>
<el-button type="primary" size="mini" class="btntopblueline" @click="categoryAdd()">添加</el-button>
</div>
<el-table v-loading="listLoading" :data="formobj.list" border style="width: 100%;">
<!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
<el-table-column fixed width="80" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column fixed label="操作" wid align="center" width="200">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="doGoods(scope.row)">删除</el-button>
<el-button type="primary" size="mini" @click="doAddBatch(scope.row)">编辑</el-button>
</template>
</el-table-column>
<el-table-column label="类别编码" prop="goodsSpuName" align="center" />
<el-table-column label="类别名称" prop="goodsSkuCode" align="center" />
<el-table-column label="价格策略" prop="goodsSkuOwnSpec" align="center" />
<el-table-column label="策略明细" prop="unit" align="center" width="600" />
</el-table>
</el-form>
</div>
</div>
<!-- 选择商品类别 -->
<choosecategory v-show="viewState == 2" ref="divSp" @backData="backData" @doback="resetState" />
<!-- 编辑价格策略 -->
<editPriceStrategy v-show="viewState == 3" ref="divSp" @backData="backData" @doback="resetState" />
</div>
</template>
<script>
import req from '@/api/storage/adjustment.js'
import {
getCurrentDate
} from '@/utils/index.js'
import choosecategory from './relation/choosecategory'
import editPriceStrategy from './relation/editPriceStrategy'
export default {
components: {
choosecategory,
editPriceStrategy
},
data() {
return {
title: "【新增】",
viewState:1,
listLoading: false,
submitdisabled: false,
formobj: {
},
}
},
created() {},
methods: {
backData(value) {
},
resetState() {
this.viewState = 1
},
categoryAdd() {
this.viewState =2
},
indexMethod(index) {
return index + 1
},
saveOrUpdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
for (var i = 0; i < this.formobj.list.length; i++) {
if (Number(this.formobj.list[i].actualInCount) == 0) {
this.$message({
showClose: true,
type: 'error',
message: '商品实收数量不能为空'
})
return
}
}
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
req.save(this.formobj).then((res) => {
if (res.success) {
this.$message({
showClose: true,
type: 'success',
message: '保存成功'
})
this.handleReturn('true')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
}
})
},
submintdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
for (var i = 0; i < this.formobj.list.length; i++) {
if (Number(this.formobj.list[i].actualInCount) == 0) {
this.$message({
showClose: true,
type: 'error',
message: '商品实收数量不能为空'
})
return
}
}
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
req.submit(this.formobj).then((res) => {
if (res.success) {
this.$message({
showClose: true,
type: 'success',
message: '保存成功'
})
this.handleReturn('true')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
}
})
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.submitdisabled = false
this.formobj = {
}
this.$emit('doback')
},
showAdd() {
},
showEdit(row) {
var params = {
sourceSid: row.sid
}
req.getInitDetails(row.sid)
.then(resp => {
if (resp.success) {
this.formobj = resp.data
this.formobj.deliveryDate = getCurrentDate()
this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1)
}
})
.catch(e => {
this.formobj = {}
})
}
}
}
</script>
<style scoped>
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.must {
color: #f00;
}
.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);
}
.first_row {
border-top: 1px solid #E0E3EB;
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
</style>

155
yxt-as-ui/src/views/storage/adjustment/adjustmentInfo.vue

@ -0,0 +1,155 @@
<template>
<div>
<div class="tab-header webtop">
<!-- 标题 -->
<div>定调价策略申请</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
<!-- end 添加修改按钮 -->
<!-- end 详情按钮 -->
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<!-- <div class="title">
<div>基础信息</div>
</div> -->
<el-row class="first_row">
<el-col :span="8">
<div class="span-sty">申请人</div>
<el-form-item><span class="addinputw addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputw addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请日期</div>
<el-form-item><span class="addinputw addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputw addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title titleOne">
<div>商品类别列表</div>
<!-- <el-button type="primary" size="mini" class="btntopblueline" @click="batchAddAll()">添加</el-button> -->
</div>
<el-table v-loading="listLoading" :data="formobj.list" border style="width: 100%;">
<!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
<el-table-column fixed width="80" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column label="类别编码" prop="goodsSpuName" align="center" />
<el-table-column label="类别名称" prop="goodsSkuCode" align="center" />
<el-table-column label="价格策略" prop="goodsSkuOwnSpec" align="center" />
<el-table-column label="策略明细" prop="unit" align="center" width="600" />
</el-table>
</el-form>
</div>
</div>
</template>
<script>
import req from '@/api/storage/adjustment.js'
export default {
components: {},
data() {
return {
listLoading: false,
submitdisabled: false,
formobj: {
},
}
},
created() {},
methods: {
indexMethod(index) {
return index + 1
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.submitdisabled = false
this.formobj = {
}
this.$emit('doback')
},
showAdd() {
},
showEdit(row) {
var params = {
sourceSid: row.sid
}
req.getInitDetails(row.sid)
.then(resp => {
if (resp.success) {
this.formobj = resp.data
this.formobj.deliveryDate = getCurrentDate()
this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1)
}
})
.catch(e => {
this.formobj = {}
})
}
}
}
</script>
<style scoped>
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.must {
color: #f00;
}
.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);
}
.first_row {
border-top: 1px solid #E0E3EB;
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
</style>

363
yxt-as-ui/src/views/storage/adjustment/index.vue

@ -0,0 +1,363 @@
<template>
<div class="app-container">
<!--列表页面-->
<div v-show="viewState == 1">
<button-bar view-title="定调价策略申请管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle" />
<!--Start查询列表部分-->
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="110px" class="tab-header">
<el-form-item label="分公司">
<el-input v-model="listQuery.params.createOrgName" placeholder="" clearable />
</el-form-item>
<el-form-item label="申请部门">
<el-input v-model="listQuery.params.deptName" placeholder="" clearable />
</el-form-item>
<el-form-item label="申请人">
<el-input v-model="listQuery.params.createByName" placeholder="" clearable />
</el-form-item>
<el-form-item label="单据编号">
<el-input v-model="listQuery.params.billNo" placeholder="" clearable />
</el-form-item>
<el-form-item label="申请日期">
<el-date-picker v-model="listQuery.params.createStartTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
type="date" placeholder="选择日期"></el-date-picker>
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.createEndTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
type="date" placeholder="选择日期"></el-date-picker>
</el-form-item>
<el-form-item label="办结日期">
<el-date-picker v-model="listQuery.params.finishStartTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
type="date" placeholder="选择日期"></el-date-picker>
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.finishEndTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
type="date" placeholder="选择日期"></el-date-picker>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" size="small" @click="handleReset">重置</el-button>
</div>
</div>
</div>
<!--End查询列表部分-->
<div class="listtop">
<div class="tit">定调价策略申请列表</div>
<!-- <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/> -->
</div>
<!--Start 主页面主要部分 -->
<div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;"
@selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="50" />
<el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
<el-table-column label="操作" width="180" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="toEdit(scope.row)"
:disabled="scope.row.nodeState =='发起申请' ? false : scope.row.nodeState == '待提交' ? false : true">办理</el-button>
<el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
</template>
</el-table-column>
<!-- <el-table-column label="流程状态" width="180" header-align="center">
<template slot-scope="scope">
<span v-if="scope.row.nodeState=='待提交'" type="primary" size="mini">待提交</span>
<span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
</template>
</el-table-column> -->
<el-table-column prop="billNo" label="流程状态" align="center" />
<el-table-column prop="billNo" label="单据编号" align="center" />
<el-table-column prop="useOrgName" label="分公司" align="center" />
<el-table-column prop="deptName" label="申请部门" align="center" />
<el-table-column prop="createTime" label="申请日期" align="center" />
<el-table-column prop="finishTime" label="办结日期" align="center" />
</el-table>
</div>
<!--End 主页面主要部分-->
<div class="pages">
<div class="tit" />
<!-- 翻页 -->
<pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
:limit.sync="listQuery.size" class="pagination" @pagination="getList" />
</div>
<!--End查询列表部分-->
</div>
</div>
<!--新增及修改 -->
<adjustmentAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState"
@reloadlist="getList" />
<!-- 详情 -->
<adjustmentInfo v-show="viewState == 4" ref="divInfo" @doback="resetState" />
<!-- 流程审批记录 -->
<el-dialog title="" :visible.sync="centerDialogVisible" width="78%" height="1%" :before-close="closeIt" center>
<iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no"
:src="this.centerDialogVisible === true ? url :''"></iframe>
</el-dialog>
</div>
</template>
<script>
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import req from '@/api/storage/adjustment.js'
import {
typeValues
} from '@/api/Common/dictcommons'
import {
getStorage
} from '@/utils/auth'
import adjustmentAdd from './adjustmentAdd'
import adjustmentInfo from './adjustmentInfo'
export default {
name: 'Procurement',
components: {
Pagination,
pageye,
ButtonBar,
adjustmentAdd,
adjustmentInfo
},
data() {
return {
url: '',
dialogHeight: '80%',
centerDialogVisible: false,
btndisabled: false,
btnList: [{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toAdd',
btnLabel: '新增'
},
{
type: 'danger',
size: 'small',
icon: 'del',
btnKey: 'doDel',
btnLabel: '删除'
},
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
isSearchShow: false,
searchxianshitit: '显示查询条件',
viewState: 1, // 1 2 3 4
tableKey: 0,
list: [],
sids: [], // SIDs
billType_list: [],
FormLoading: false,
listLoading: false,
//
listQuery: {
current: 1,
size: 5,
total: 0,
params: {
createOrgName: '',
deptName: '',
createByName: '',
billNo: '',
createStartTime: '',
createEndTime: '',
finishStartTime: '',
finishEndTime: '',
}
}
}
},
created() {
//
// this.getList()
},
mounted() {
// vuewindowpostMessagehandleMessage
window.addEventListener('message', this.handleMessage)
this.$refs['btnbar'].setButtonList(this.btnList)
},
methods: {
init() {
typeValues({
type: 'billType'
}).then((res) => {
if (res.success) {
this.billType_list = res.data
}
})
},
async handleMessage(event) {
var code = ''
if (event.data.params !== null && event.data.params !== undefined) {
code = event.data.params.code
}
if (code === 1) {
this.centerDialogVisible = false
} else if (code === 2) {
this.dialogHeight = event.data.params.data
this.setIframeHeight(document.getElementById('iframe'))
}
},
closeIt() {
this.url = ''
this.centerDialogVisible = false
},
setIframeHeight(iframe) {
iframe.height = this.dialogHeight
},
flowRecord(row) {
this.centerDialogVisible = true
var params = {
deployId: row.procDefId,
procInsId: row.procInstId,
token: getStorage()
}
this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
},
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
btnHandle(btnKey) {
console.log('XXXXXXXXXXXXXXX ' + btnKey)
switch (btnKey) {
case 'toAdd':
this.toAdd()
break
case 'doDel':
this.doDel()
break
case 'doClose':
this.doClose()
break
default:
break
}
},
// sid
handleSelectionChange(row) {
const aa = []
row.forEach(element => {
aa.push(element.sid)
})
this.sids = aa
},
//
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
},
//
getList() {
this.listLoading = true
this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
req.listPage(this.listQuery).then((response) => {
this.listLoading = false
if (response.success) {
this.list = response.data.records
this.listQuery.total = response.data.total
} else {
this.list = []
this.listQuery.total = 0
}
})
},
//
handleFilter() {
this.listQuery.current = 1
this.getList()
},
//
handleReset() {
this.listQuery = {
current: 1,
size: 5,
total: 0,
params: {
createOrgName: '',
deptName: '',
createByName: '',
billNo: '',
createStartTime: '',
createEndTime: '',
finishStartTime: '',
finishEndTime: '',
}
}
this.init()
},
toAdd(){
this.viewState = 3
this.$refs['divAdd'].showAdd()
},
toEdit(row) {
this.viewState = 3
this.$refs['divAdd'].showEdit(row)
},
toInfo(row) {
this.viewState = 4
this.$refs['divInfo'].showInfo(row)
},
doDel() {
if (this.sids.length === 0) {
this.$message({
showClose: true,
type: 'error',
message: '请选择至少一条记录进行删除操作'
})
return
}
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.deleteBySids(this.sids).then(resp => {
if (resp.success) {
this.$message({
type: 'success',
message: resp.msg,
showClose: true
})
}
this.getList()
loading.close()
}).catch(e => {
loading.close()
})
}).catch(() => {})
},
//
resetState() {
this.viewState = 1
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
}
}
}
</script>
<style scoped>
</style>

181
yxt-as-ui/src/views/storage/adjustment/relation/choosecategory.vue

@ -0,0 +1,181 @@
<template>
<div class="app-container">
<div>
<div class="tab-header webtop">
<div>选择商品类别</div>
<div>
<el-button type="primary" size="small" @click="AddUpdateReturn">确定</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="120px" class="tab-header">
<el-form-item label="类别编码" class="searchlist">
<el-input v-model="listQuery.params.code" placeholder="" clearable />
</el-form-item>
<el-form-item label="类别名称" class="searchlist">
<el-input v-model="listQuery.params.name" placeholder="" clearable />
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="handleReset" size="small">重置</el-button>
</div>
</div>
</div>
<div class="listtop">
<div class="tit">商品类别列表</div>
<!-- <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>-->
</div>
<div class="">
<el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%"
@selection-change="handleSelectionChange">
<el-table-column width="50px" type="selection" align="center"/>
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center" />
<!-- <el-table-column fixed label="操作" width="100" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="toInfo(scope.row)">确认</el-button>
</template>
</el-table-column> -->
<el-table-column prop="billNo" label="类别编码" align="center" />
<el-table-column prop="billType" label="类别名称" align="center" />
</el-table>
</div>
<div class="pages">
<div class="tit" />
<!-- 翻页 -->
<Pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
:limit.sync="listQuery.size" class="pagination" @pagination="getList" />
</div>
</div>
</div>
</div>
</template>
<script>
import Pagination from '@/components/pagination'
import {
getGoodsCategory
} from '@/api/Common/dictcommons'
export default {
name: 'SelectVehicle',
components: {
Pagination
},
data() {
return {
isSearchShow: false,
searchxianshitit: '隐藏查询条件',
tableKey: 0,
sids: [],
list: [],
number: '',
listLoading: false,
listQuery: {
current: 1,
size: 10,
params: {
code: '',
name: '',
},
total: 0
}
}
},
methods: {
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
},
//
getList() {
this.listLoading = true
this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
// this.listQuery.params.menuUrl = this.$route.path
this.listQuery.params.menuUrl = ""
getGoodsCategory(this.listQuery).then((response) => {
this.listLoading = false
if (response.success) {
this.listQuery.total = response.data.total
this.list = response.data.records
}
})
},
//
handleFilter() {
this.listQuery.current = 1
this.getList()
},
//
handleReset() {
this.listQuery = {
current: 1,
size: 10,
params: {
code: '',
name: '',
},
total: 0
}
this.getList()
},
handleSelectionChange(row) {
this.sids = row
},
showData(value, createOrgSid) {
// const aa = []
// if (value.length > 0) {
// for (var i = 0; i < value.length; i++) {
// aa.push(value[i].saleVehSid)
// }
// this.listQuery.params.saleVehSids = aa
// } else {
// this.listQuery.params.saleVehSids = []
// }``
this.listQuery.params.createOrgSid = createOrgSid
this.listQuery.current = 1
this.listQuery.size = 10
this.listQuery.total = 0
this.getList()
},
//
AddUpdateReturn() {
if (this.sids.length > 0) {
this.$emit('backData', this.sids)
} else {
this.$notify({
title: '提示',
message: '请至少选择一条记录进行操作',
type: 'error',
duration: 2000
})
}
},
toInfo(row){
this.$emit('backData', row.sid)
},
//
handleReturn() {
this.$emit('doback')
}
}
}
</script>
<style scoped>
</style>

176
yxt-as-ui/src/views/storage/adjustment/relation/editPriceStrategy.vue

@ -0,0 +1,176 @@
<template>
<div>
<div class="tab-header webtop">
<!-- 标题 -->
<div>价格策略设置</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="info" size="small" @click="saveData()">保存</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
<!-- end 添加修改按钮 -->
<!-- end 详情按钮 -->
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<!-- <div class="title">
<div>基础信息</div>
</div> -->
<el-row class="first_row">
<el-col :span="12">
<div class="span-sty">商品类别名称</div>
<el-form-item><span class="addinputw addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">价格策略</div>
<el-form-item><span class="addinputw addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">加价比例(%)</div>
<el-form-item>
<el-radio-group v-model="formobj.isLockingSalesPrice" size="small" style="margin-left: 120px;"
@change="selectIsLockingSalesPrice">
<el-radio :label="'1'">固定比例</el-radio>
<el-radio :label="'2'">价格区间</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<div class="title titleOne">
<div>价格区间加价策略</div>
<el-button type="primary" size="mini" class="btntopblueline" @click="batchAddAll()">添加</el-button>
</div>
<el-table :data="formobj.list" border style="width: 100%;">
<!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
<el-table-column fixed width="80" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column fixed label="操作" width="100" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="toInfo(scope.row)">删除</el-button>
</template>
</el-table-column>
<!-- <el-table-column label="区间开始" prop="goodsSpuName" align="center" />
<el-table-column label="区间截止" prop="goodsSkuCode" align="center" />
<el-table-column label="加价比例(%)" prop="goodsSkuOwnSpec" align="center" /> -->
<el-table-column label="区间开始" align="center">
<template slot-scope="scope">
<el-input ref="focusAssumptionInput" v-model="scope.row.rejectReason" clearable placeholder="" />
</template>
</el-table-column>
<el-table-column label="区间截止" align="center">
<template slot-scope="scope">
<el-input ref="focusAssumptionInput" v-model="scope.row.rejectReason" clearable placeholder="" />
</template>
</el-table-column>
<el-table-column label="加价比例(%)" align="center">
<template slot-scope="scope">
<el-input ref="focusAssumptionInput" v-model="scope.row.rejectReason" clearable placeholder="" />
</template>
</el-table-column>
</el-table>
</el-form>
</div>
</div>
</template>
<script>
import Pagination from '@/components/pagination'
import {
getAsBusrepairBill
} from '@/api/Common/dictcommons'
export default {
name: 'SelectVehicle',
components: {
Pagination
},
data() {
return {
isSearchShow: false,
searchxianshitit: '隐藏查询条件',
sids: [],
formobj:{}
}
},
methods: {
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
},
//
AddUpdateReturn() {
if (this.sids.length > 0) {
this.$emit('backData', this.sids)
} else {
this.$notify({
title: '提示',
message: '请至少选择一条记录进行操作',
type: 'error',
duration: 2000
})
}
},
showAdd(row){
this.formobj = row
},
//
handleReturn() {
this.$emit('doback')
},
selectIsLockingSalesPrice(val){
}
}
}
</script>
<style scoped>
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.must {
color: #f00;
}
.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);
}
.first_row {
border-top: 1px solid #E0E3EB;
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
</style>

54
yxt-as-ui/src/views/storage/maintenanceInOrOutBound/maintenanceReturnBoundInfo.vue

@ -139,40 +139,38 @@
<div class="title titleOne">
<div>服务项目</div>
</div>
<el-table v-loading="listLoading" :data="formobj.baseGoodsSkus" border>
<!-- <el-table-column type="selection" align="center" width="50"/> -->
<el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
<el-table-column label="服务项目" prop="serviceItem" align="center" />
<el-table-column label="工种" prop="serviceType" align="center" />
<el-table-column label="科目" prop="subject" align="center" />
<el-table-column label="维修人" prop="repairerName" align="center" />
<el-table-column label="考核工时" prop="examineHourPrice" align="center" />
<el-table-column label="工时单价" prop="hourPrice" align="center" />
<el-table-column label="工时数" prop="hours" align="center" />
<el-table-column label="销售价" prop="price" align="center" />
<el-table-column label="折扣" prop="discount" align="center" />
<el-table-column label="优惠" prop="discountAmount" align="center" />
<el-table-column label="金额" prop="amount" align="center" />
<el-table-column label="备注" prop="remarks" align="center" />
</el-table>
<el-table v-loading="listLoading" :data="formobj.sitemVoList" border>
<el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
<el-table-column label="服务项目" prop="serviceItem" align="center" />
<el-table-column label="工种" prop="serviceType" align="center" />
<el-table-column label="科目" prop="subject" align="center" />
<el-table-column label="维修人" prop="repairerName" align="center" />
<el-table-column label="考核工时" prop="examineHourPrice" align="center" />
<el-table-column label="工时单价" prop="hourPrice" align="center" />
<el-table-column label="工时数" prop="hours" align="center" />
<el-table-column label="销售价" prop="price" align="center" />
<el-table-column label="折扣" prop="discount" align="center" />
<el-table-column label="优惠" prop="discountAmount" align="center" />
<el-table-column label="金额" prop="amount" align="center" />
<el-table-column label="备注" prop="remarks" align="center" />
</el-table>
<div class="title titleOne">
<div>商品列表</div>
</div>
<el-table v-loading="listLoading" :data="formobj.baseGoodsSkus" border>
<!-- <el-table-column type="selection" align="center" width="50"/> -->
<el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
<el-table-column label="项目名称" prop="serviceItem" align="center" />
<el-table-column label="商品名称" prop="goodsSpuName" align="center" />
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" />
<el-table-column label="单位" prop="unit" align="center" />
<el-table-column label="仓库" prop="warehouseName" align="center" />
<el-table-column label="库位" prop="warehouseRackCode" align="center" />
<el-table-column label="已出数量" prop="outboundCount" align="center" />
<el-table v-loading="listLoading" :data="formobj.detailList" border>
<el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
<el-table-column label="项目名称" prop="serviceItem" align="center" />
<el-table-column label="商品名称" prop="goodsSpuName" align="center" />
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" />
<el-table-column label="单位" prop="unit" align="center" />
<el-table-column label="仓库" prop="warehouseName" align="center" />
<el-table-column label="库位" prop="warehouseRackCode" align="center" />
<el-table-column label="已出数量" prop="outboundCount" align="center" />
<el-table-column label="退库数量" prop="count" align="center" />
<el-table-column label="销售单价" prop="price" align="center" />
<el-table-column label="备注" prop="remarks" align="center" />
<el-table-column label="备注" prop="remarks" align="center" />
</el-table>

12
yxt-as-ui/src/views/storage/receivingGoods/index.vue

@ -25,7 +25,7 @@
</el-form-item>
<el-form-item label="业务类型">
<el-select v-model="queryParams.params.busTypeKey" placeholder="请选择">
<el-option v-for="(item,i) in busTypeList" :key="i" :label="item.name" :value="item.sid">
<el-option v-for="(item,i) in busTypeList" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
</el-option>
</el-select>
</el-form-item>
@ -110,6 +110,9 @@
import divAdd from './receivingGoodsAdd.vue'
import divInfo from './receivingGoodsInfo.vue'
import divAddupShelfRecord from './upShelfAddRecord.vue'
import {
getTypeValueList
} from '@/api/Common/dictcommons'
export default {
components: {
ButtonBar,
@ -202,6 +205,13 @@
},
created() {
this.loadList()
getTypeValueList({ type: 'wms_busType', groupNum: 'wms_rk' }).then((res) => {
if (res.success) {
this.busTypeList = res.data
}
})
},
methods: {
saveExamine() {

46
yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue

@ -50,7 +50,7 @@
<div class="span-sty"><span class="must">*</span> 业务类型</div>
<el-form-item prop="busTypeValue"><el-select v-model="formobj.busTypeValue" filterable clearable
placeholder="请选择" class="addinputInfo" @change="busTypeSelect">
<el-option v-for="item in busTypeList" :key="item.sid" :label="item.name" :value="item.sid">
<el-option v-for="(item,i) in busTypeList" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
</el-option>
</el-select></el-form-item>
</el-col>
@ -58,7 +58,7 @@
<div class="span-sty"><span class="must">*</span> 供应商</div>
<el-form-item prop="supplierName"> <el-select v-model="formobj.supplierName" filterable clearable
placeholder="请选择" class="addinputInfo" @change="supplierNameSelect">
<el-option v-for="item in supplierList" :key="item.sid" :label="item.name" :value="item.sid">
<el-option v-for="item in supplierList" :key="item.sid" :label="item.supplierName" :value="item.sid">
</el-option>
</el-select></el-form-item>
</el-col>
@ -277,7 +277,8 @@
import chooseproducts from './relation/chooseproducts'
import {
choiceSupplierInfo,
getOrgSidByPath
getOrgSidByPath,
getTypeValueList
} from '@/api/Common/dictcommons'
export default {
components: {
@ -296,8 +297,10 @@
"sourceBillNo": "",
"createBySid": window.sessionStorage.getItem('userSid'),
"createByName": window.sessionStorage.getItem('name'),
"deptName": '',
"deptSid": '',
"deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
"deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1),
"createTime": getCurrentDate(),
"busTypeKey": "",
"busTypeValue": "",
@ -313,11 +316,15 @@
},
hideUploadBtn: false,
busTypeList: [{
name: "业务类型1",
name: "采购预约",
sid: "0"
},
{
name: "调拨预约",
sid: "1"
},
{
name: "业务类型2",
name: "其他预约",
sid: "2"
}
],
@ -640,8 +647,10 @@
"sourceBillNo": "",
"createBySid": window.sessionStorage.getItem('userSid'),
"createByName": window.sessionStorage.getItem('name'),
"deptName": '',
"deptSid": '',
"deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
"deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1),
"createTime": getCurrentDate(),
"busTypeKey": "",
"busTypeValue": "",
@ -672,6 +681,12 @@
this.$refs['form_obj'].clearValidate()
})
getTypeValueList({ type: 'wms_busType', groupNum: 'wms_rk' }).then((res) => {
if (res.success) {
this.busTypeList = res.data
}
})
},
showEdit(row) {
@ -685,6 +700,13 @@
this.$refs['form_obj'].clearValidate()
})
getTypeValueList({ type: 'wms_busType', groupNum: 'wms_rk' }).then((res) => {
if (res.success) {
this.busTypeList = res.data
}
})
var params = {
sid: row.sid
@ -709,10 +731,10 @@
})
},
busTypeSelect(val) {
const choose = this.busTypeList.filter((item) => item.sid == val)
const choose = this.busTypeList.filter((item) => item.dictKey == val)
console.log('>>>>>>>>>busTypeSelect', choose)
this.formobj.busTypeKey = choose[0].sid
this.formobj.busTypeValue = choose[0].name
this.formobj.busTypeKey = choose[0].dictKey
this.formobj.busTypeValue = choose[0].dictValue
},
supplierNameSelect(val) {

36
yxt-as-ui/src/views/warehouse/goodsShelves/goodsShelvesAdd.vue

@ -54,8 +54,8 @@
<el-col :span="16">
<div class="span-sty"><span class="must">*</span> 库位编码</div>
<el-form-item prop="rackCode">
<el-input v-model="formobj.rackCode" placeholder="库位编码" class="addinputw addinputInfo" clearable
oninput="value=value.replace(/[^A-Za-z0-9]/g, '')" />
<el-input v-model="formobj.rackCode" placeholder="格式:排-架-层-位" class="addinputw addinputInfo" clearable
oninput="this.value=this.value.replace(/[^\w_-]/g,'');" />
</el-form-item>
</el-col>
</el-row>
@ -177,7 +177,12 @@
getWarehouseArea(sid) {
this.formobj.locationSid = ''
this.formobj.locationName = ''
req3.getAllWarehouseareaBysid(sid).then(resp => {
var params = {
ckSid: sid
}
req3.getAllWarehouseareaBysid(params).then(resp => {
console.log('>>>>>>>>>getAllWarehousearea', resp)
this.warehouseAreaList = resp.data
}).catch(() => {})
@ -242,6 +247,31 @@
// }
var aaa = this.formobj.rackCode.split('-')
console.log('>>>>>>>>>saveOrUpdate', aaa)
if (aaa.length != 4) {
this.$message({
showClose: true,
type: 'warning',
message: '库位编码格式错误'
})
return
}
for (var i = 0; i < aaa.length; i++) {
if (aaa[i] == '') {
this.$message({
showClose: true,
type: 'warning',
message: '库位编码格式错误'
})
return
}
}
this.$refs['form_obj'].validate((valid) => {
if (valid) {
req.saveGoodsShelves(this.formobj)

431
yxt-as-ui/src/views/workFlow/suopeitiaozhengFlow/claimadjustmentDaiBan.vue

@ -0,0 +1,431 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="primary" size="small" @click="openCountersign('加签')"> </el-button>
<el-button type="primary" size="small" @click="openAgree('同意')"> </el-button>
<el-button type="danger" size="small" @click="openReject('驳回')"> </el-button>
<el-button type="danger" size="small" @click="openStop('终止')"> </el-button>
</div>
</div>
<div class="">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></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.remarks }}</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.fileList" :key="index" :src="item" :preview-src-list="formobj.fileList" /></el-form-item>
</el-col>
</el-row>
<div class="title">开票索赔单列表</div>
<el-table :key="tableKey" :data="formobj.detailsList" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="repairBillNo" label="维修工单号" align="center" width="170"/>
<el-table-column prop="vehMark" label="车牌号" align="center" width="150"/>
<el-table-column prop="vinNo" label="车架号" align="center" width="150"/>
<el-table-column label="工单" align="center" width="120">
<el-table-column prop="hourAmount1" label="工时费" align="center" width="120"/>
<el-table-column prop="goodsAmount1" label="材料费" align="center" width="120"/>
<el-table-column prop="claimOutAmount1" label="外出费" align="center" width="120"/>
<el-table-column prop="claimSubsidyAmount1" label="厂家补助" align="center" width="120"/>
<el-table-column prop="claimOtherAmount1" label="其他费用" align="center" width="120"/>
<el-table-column prop="all1" label="合计" align="center" width="120"/>
</el-table-column>
<el-table-column label="索赔开票" align="center" width="120">
<el-table-column prop="claimHourAmount2" label="工时费" align="center" width="120"/>
<el-table-column prop="claimGoodsAmount2" label="材料费" align="center" width="120"/>
<el-table-column prop="claimOutAmount2" label="外出费" align="center" width="120"/>
<el-table-column prop="claimSubsidyAmount2" label="厂家补助" align="center" width="120"/>
<el-table-column prop="claimOtherAmount2" label="其他费用" align="center" width="120"/>
<el-table-column prop="all2" label="合计" align="center" width="120"/>
</el-table-column>
<el-table-column prop="all3" label="差异合计" align="center" width="120"/>
<el-table-column label="差异调整" align="center" width="120">
<el-table-column prop="claimHourAmount" label="工时费" align="center" width="150" />
<el-table-column prop="claimGoodsAmount" label="材料费" align="center" width="150" />
<el-table-column prop="claimOutAmount" label="外出费" align="center" width="150" />
<el-table-column prop="claimSubsidyAmount" label="厂家补助" align="center" width="150" />
<el-table-column prop="claimOtherAmount" label="其他费用" align="center" width="150" />
<el-table-column prop="reserved" label="预留" align="center" width="150" />
<el-table-column prop="all4" label="合计" align="center" width="150" />
<el-table-column prop="reasonValue" label="调整原因" align="center" width="150" />
</el-table-column>
</el-table>
</el-form>
</div>
</div>
<!-- 选择待办人 的弹出框-->
<el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
<el-form class="formadd" >
<el-row v-show="countersignLink" style="border-top: 1px solid #e0e3eb">
<el-col :span="4" class="tleftb">
<span class="icon">*</span>加签人员:
</el-col>
<el-col :span="20">
<el-form-item>
<el-select v-model="countersign.assignee" placeholder="请选择" filterable>
<el-option v-for="item in options" :key="item.userSid" :label="item.staffName" :value="item.userSid">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
<el-col :span="4" class="tleftb">
<span>当前环节:</span>
</el-col>
<el-col :span="20">
<el-form-item><span>{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
</el-col>
</el-row>
<el-row :class="{rowClass:!currentLink}">
<el-col :span="4" class="tleftb">
<span>意见:</span>
</el-col>
<el-col :span="20">
<el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw" type="textarea" :autosize="{ minRows: 1, maxRows: 10}" clearable ></el-input></el-form-item>
</el-col>
</el-row>
<div style="text-align:center;margin-top: 20px;">
<el-button type="primary" size="mini" @click="reject"> </el-button>
<el-button type="info " size="mini" @click="nodeDialogVisible = false"> </el-button>
</div>
</el-form>
</el-dialog>
</div>
</template>
<script>
import req from '@/api/operation/claimadjustment'
import { selectStaffListss } from '@/api/Common/dictcommons'
export default {
name: 'ClaimAdjustmentDaiBan',
data() {
return {
viewTitle: '',
viewState: 1,
tableKey: 1,
index: 0,
formobj: {
sid: '',
createBySid: '',
createByName: '',
orgPath: '',
createTime: '',
deptSid: '',
deptName: '',
fileList: [],
remarks: '',
billNo: '',
createOrgSid: '',
useOrgSid: '',
useOrgName: '',
closeDate: '',
procInstId: '',
procDefId: '',
taskId: '',
taskDefKey: '',
nodeState: '',
detailsList: []
},
rules: {},
options: [],
operation: '', //
dialogList: {
comment: ''
},
startTask: true,
current: {
taskDefKey: '',
taskName: '' //
},
nextNode: {}, //
nodeDialogVisible: false,
currentLink: true,
countersignLink: false,
//
linkByParameter: {
businessSid: '',
comment: '',
instanceId: '',
taskId: '',
orgSidPath: '',
taskDefKey: '',
userSid: ''
},
//
countersign: {
taskId: '',
assignee: '',
userSid: '',
instanceId: '',
views: ''
}
}
},
created() {
console.log('url:' + window.location.href)
var one = window.location.href.indexOf('&data') + 6
const data = window.location.href.substr(one) // urlunescape()web,使
const obj = JSON.parse(decodeURIComponent(data))
console.log('iframe页面获取的obj:', obj)
//
this.linkByParameter.businessSid = obj.businessSid
this.linkByParameter.instanceId = obj.instanceId
this.linkByParameter.taskId = obj.taskId
this.linkByParameter.taskDefKey = obj.taskDefKey
// this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
this.current.taskDefKey = obj.taskDefKey
this.current.taskName = obj.taskName
//
this.countersign.taskId = obj.taskId
this.countersign.userSid = window.sessionStorage.getItem('userSid')
this.countersign.instanceId = obj.instanceId
//
this.showInfo(obj.businessSid)
},
mounted() {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 2,
data: 400 + 'px'
}
}, '*')
},
methods: {
showInfo(sid) {
this.viewTitle = '工单索赔调整申请详情'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
req.fetchDetailsBySid({ sid: sid }).then((res) => {
if (res.success) {
this.formobj = res.data
this.formobj.instanceId = res.data.procInstId
if (this.formobj.fileList.length > 0) {
const aa = []
this.formobj.fileList.forEach((e) => {
aa.push(e.url)
})
this.formobj.fileList = aa
}
}
})
selectStaffListss().then((res) => {
if (res.success) {
this.options = res.data
}
})
},
//
openCountersign(val) {
this.operation = val
this.currentLink = true
this.countersignLink = true
this.dialogList.comment = ''
req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
},
//
openAgree(val) {
this.operation = val
this.currentLink = true
this.countersignLink = false
this.dialogList.comment = '同意'
req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
},
//
openReject(val) {
this.operation = val
this.currentLink = true
this.countersignLink = false
this.dialogList.comment = ''
req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
},
//
openStop(val) {
this.operation = val
this.currentLink = false
this.countersignLink = false
this.dialogList.comment = ''
this.nodeDialogVisible = true
},
reject() {
if (this.operation === '同意') {
this.handleAgree()
} else if (this.operation === '驳回') {
if (this.dialogList.comment === '') {
this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
} else {
this.handleReject()
}
} else if (this.operation === '终止') {
if (this.dialogList.comment === '') {
this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
} else {
this.handleStop()
}
} else if (this.operation === '加签') {
this.handleCountersign()
}
},
/** 加签 */
handleCountersign() {
if (this.countersign.assignee === '') {
this.$message({ showClose: true, type: 'error', message: '请选择加签人员' })
return
}
if (this.dialogList.comment === '') {
this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
return
}
this.countersign.views = this.dialogList.comment
req.delegate(this.countersign).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 同意任务 */
handleAgree() {
this.linkByParameter.comment = this.dialogList.comment
req.complete(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 驳回任务 */
handleReject() {
this.linkByParameter.comment = this.dialogList.comment
req.reject(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 终止任务 */
handleStop() {
this.linkByParameter.comment = this.dialogList.comment
req.breakProcess(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
}
}
}
</script>
<style scoped>
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
.rowClass{
border-top: 1px solid #E0E3EB;
}
</style>

282
yxt-as-ui/src/views/workFlow/suopeitiaozhengFlow/claimadjustmentEdit.vue

@ -0,0 +1,282 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交</el-button>
</div>
</div>
<div class="">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><el-input class="addinputInfo" style="width: 80%" v-model="formobj.remarks" clearable placeholder="" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">附件</div>
<el-form-item>
<uploadImg ref="uploadImg" class="addinputInfo" v-model="formobj.fileList" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
</el-form-item>
</el-col>
</el-row>
<div class="title">开票索赔单列表</div>
<el-table :key="tableKey" :data="formobj.detailsList" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="repairBillNo" label="维修工单号" align="center" width="170" />
<el-table-column prop="vehMark" label="车牌号" align="center" width="150" />
<el-table-column prop="vinNo" label="车架号" align="center" width="150" />
<el-table-column label="工单" align="center" width="120">
<el-table-column prop="hourAmount1" label="工时费" align="center" width="120" />
<el-table-column prop="goodsAmount1" label="材料费" align="center" width="120" />
<el-table-column prop="claimOutAmount1" label="外出费" align="center" width="120" />
<el-table-column prop="claimSubsidyAmount1" label="厂家补助" align="center" width="120" />
<el-table-column prop="claimOtherAmount1" label="其他费用" align="center" width="120" />
<el-table-column prop="all1" label="合计" align="center" width="120" />
</el-table-column>
<el-table-column label="索赔开票" align="center" width="120">
<el-table-column prop="claimHourAmount2" label="工时费" align="center" width="120" />
<el-table-column prop="claimGoodsAmount2" label="材料费" align="center" width="120" />
<el-table-column prop="claimOutAmount2" label="外出费" align="center" width="120" />
<el-table-column prop="claimSubsidyAmount2" label="厂家补助" align="center" width="120" />
<el-table-column prop="claimOtherAmount2" label="其他费用" align="center" width="120" />
<el-table-column prop="all2" label="合计" align="center" width="120" />
</el-table-column>
<el-table-column prop="all3" label="差异合计" align="center" width="120" />
<el-table-column label="差异调整" align="center" width="120">
<el-table-column label="工时费" align="center" width="150">
<template slot-scope="scope">
<el-input @input="jeTotal(scope.row)" @keyup.native="scope.row.claimHourAmount = getNumber(scope.row.claimHourAmount, 2)" v-model="scope.row.claimHourAmount" clearable placeholder="" />
</template>
</el-table-column>
<el-table-column label="材料费" align="center" width="150">
<template slot-scope="scope">
<el-input @input="jeTotal(scope.row)" @keyup.native="scope.row.claimGoodsAmount = getNumber(scope.row.claimGoodsAmount, 2)" v-model="scope.row.claimGoodsAmount" clearable placeholder="" />
</template>
</el-table-column>
<el-table-column label="外出费" align="center" width="150">
<template slot-scope="scope">
<el-input @input="jeTotal(scope.row)" @keyup.native="scope.row.claimOutAmount = getNumber(scope.row.claimOutAmount, 2)" v-model="scope.row.claimOutAmount" clearable placeholder="" />
</template>
</el-table-column>
<el-table-column label="厂家补助" align="center" width="150">
<template slot-scope="scope">
<el-input @input="jeTotal(scope.row)" @keyup.native="scope.row.claimSubsidyAmount = getNumber(scope.row.claimSubsidyAmount, 2)" v-model="scope.row.claimSubsidyAmount" clearable placeholder="" />
</template>
</el-table-column>
<el-table-column label="其他费用" align="center" min-width="150">
<template slot-scope="scope">
<el-input @input="jeTotal(scope.row)" @keyup.native="scope.row.claimOtherAmount = getNumber(scope.row.claimOtherAmount, 2)" v-model="scope.row.claimOtherAmount" clearable placeholder="" />
</template>
</el-table-column>
<el-table-column label="预留" align="center" min-width="150">
<template slot-scope="scope">
<el-input @input="jeTotal(scope.row)" @keyup.native="scope.row.reserved = getNumber(scope.row.reserved, 2)" v-model="scope.row.reserved" clearable placeholder="" />
</template>
</el-table-column>
<el-table-column prop="all4" label="合计" align="center" width="100" />
<el-table-column label="调整原因" align="center" width="100">
<template slot-scope="scope">
<el-select v-model="scope.row.reasonKey" placeholder="请选择" filterable clearable @change="reasonChange($event, scope.row)">
<el-option v-for="item in adjustmentReason_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
</el-option>
</el-select>
</template>
</el-table-column>
</el-table-column>
</el-table>
</el-form>
</div>
</div>
</div>
</template>
<script>
import req from '@/api/operation/claimadjustment'
import uploadImg from '@/components/uploadFile/uploadImg'
import { typeValues } from '@/api/Common/dictcommons'
export default {
name: 'ClaimAdjustmentEdit',
components: {
uploadImg
},
data() {
return {
viewTitle: '',
viewState: 1,
submitdisabled: false,
tableKey: 1,
index: 0,
adjustmentReason_list: [],
formobj: {
sid: '',
createBySid: '',
createByName: '',
orgPath: '',
createTime: '',
deptSid: '',
deptName: '',
fileList: [],
remarks: '',
billNo: '',
createOrgSid: '',
useOrgSid: '',
useOrgName: '',
closeDate: '',
procInstId: '',
procDefId: '',
taskId: '',
taskDefKey: '',
nodeState: '',
detailsList: []
},
rules: {}
}
},
created() {
console.log('url:' + window.location.href)
var one = window.location.href.indexOf('&data') + 6
const data = window.location.href.substr(one) // urlunescape()web,使
const obj = JSON.parse(decodeURIComponent(data))
this.showInfo(obj.businessSid)
},
mounted() {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 2,
data: 500 + 'px'
}
}, '*')
},
methods: {
init() {
typeValues({ type: 'adjustmentReason' }).then((res) => {
if (res.success) {
this.adjustmentReason_list = res.data
}
})
},
getNumber(val, limit) {
val = val.replace(/[^0-9.]/g, '') //
val = val.replace(/^00/, '0.') // 0
val = val.replace(/^\./g, '0.') // 0.
val = val.replace(/\.{2,}/g, '.') //
val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); //
/^0\d+/.test(val) ? val = val.slice(1) : '' // 0
const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
const reg = new RegExp(str)
if (limit === 0) {
//
val = val.replace(reg, '$1')
} else {
//
val = val.replace(reg, '$1.$2')
}
return val
},
showInfo(sid) {
this.viewTitle = '【编辑】工单索赔调整申请'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.init()
req.fetchDetailsBySid({ sid: sid }).then((res) => {
if (res.success) {
this.formobj = res.data
this.formobj.instanceId = res.data.procInstId
}
})
},
//
jeTotal(row) {
row.all4 = Math.round((parseFloat(row.claimHourAmount === '' ? '0' : row.claimHourAmount) + parseFloat(row.claimGoodsAmount === '' ? '0' : row.claimGoodsAmount) + parseFloat(row.claimOutAmount === '' ? '0' : row.claimOutAmount) + parseFloat(row.claimSubsidyAmount === '' ? '0' : row.claimSubsidyAmount) + parseFloat(row.claimOtherAmount === '' ? '0' : row.claimOtherAmount) - parseFloat(row.reserved === '' ? '0' : row.reserved)) * 100) / 100
},
reasonChange(value, row) {
const choose = this.adjustmentReason_list.filter((item) => item.dictKey === value)
if (choose.length > 0 && choose !== null) {
row.reasonValue = choose[0].dictValue
} else {
row.reasonValue = ''
}
},
saveOrUpdate() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
req.saveOrUpdate(this.formobj).then((res) => {
if (res.success) {
this.$message({ showClose: true, type: 'success', message: '保存成功' })
// ()
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
}
})
},
submit() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
req.submit(this.formobj).then((res) => {
if (res.success) {
this.$message({ showClose: true, type: 'success', message: '提交成功' })
// ()
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
}
})
}
}
}
</script>
<style scoped>
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
</style>

217
yxt-as-ui/src/views/workFlow/suopeitiaozhengFlow/claimadjustmentYiBan.vue

@ -0,0 +1,217 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="danger" size="small" @click="openRevoke()">撤回</el-button>
</div>
</div>
<div class="">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></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.remarks }}</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.fileList" :key="index" :src="item" :preview-src-list="formobj.fileList" /></el-form-item>
</el-col>
</el-row>
<div class="title">开票索赔单列表</div>
<el-table :key="tableKey" :data="formobj.detailsList" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="repairBillNo" label="维修工单号" align="center" width="170"/>
<el-table-column prop="vehMark" label="车牌号" align="center" width="150"/>
<el-table-column prop="vinNo" label="车架号" align="center" width="150"/>
<el-table-column label="工单" align="center" width="120">
<el-table-column prop="hourAmount1" label="工时费" align="center" width="120"/>
<el-table-column prop="goodsAmount1" label="材料费" align="center" width="120"/>
<el-table-column prop="claimOutAmount1" label="外出费" align="center" width="120"/>
<el-table-column prop="claimSubsidyAmount1" label="厂家补助" align="center" width="120"/>
<el-table-column prop="claimOtherAmount1" label="其他费用" align="center" width="120"/>
<el-table-column prop="all1" label="合计" align="center" width="120"/>
</el-table-column>
<el-table-column label="索赔开票" align="center" width="120">
<el-table-column prop="claimHourAmount2" label="工时费" align="center" width="120"/>
<el-table-column prop="claimGoodsAmount2" label="材料费" align="center" width="120"/>
<el-table-column prop="claimOutAmount2" label="外出费" align="center" width="120"/>
<el-table-column prop="claimSubsidyAmount2" label="厂家补助" align="center" width="120"/>
<el-table-column prop="claimOtherAmount2" label="其他费用" align="center" width="120"/>
<el-table-column prop="all2" label="合计" align="center" width="120"/>
</el-table-column>
<el-table-column prop="all3" label="差异合计" align="center" width="120"/>
<el-table-column label="差异调整" align="center" width="120">
<el-table-column prop="claimHourAmount" label="工时费" align="center" width="150" />
<el-table-column prop="claimGoodsAmount" label="材料费" align="center" width="150" />
<el-table-column prop="claimOutAmount" label="外出费" align="center" width="150" />
<el-table-column prop="claimSubsidyAmount" label="厂家补助" align="center" width="150" />
<el-table-column prop="claimOtherAmount" label="其他费用" align="center" width="150" />
<el-table-column prop="reserved" label="预留" align="center" width="150" />
<el-table-column prop="all4" label="合计" align="center" width="150" />
<el-table-column prop="reasonValue" label="调整原因" align="center" width="150" />
</el-table-column>
</el-table>
</el-form>
</div>
</div>
</div>
</template>
<script>
import req from '@/api/operation/claimadjustment'
export default {
name: 'ClaimAdjustmentYiBan',
data() {
return {
viewTitle: '',
viewState: 1,
tableKey: 1,
index: 0,
formobj: {
sid: '',
createBySid: '',
createByName: '',
orgPath: '',
createTime: '',
deptSid: '',
deptName: '',
fileList: [],
remarks: '',
billNo: '',
createOrgSid: '',
useOrgSid: '',
useOrgName: '',
closeDate: '',
procInstId: '',
procDefId: '',
taskId: '',
taskDefKey: '',
nodeState: '',
detailsList: []
},
rules: {},
//
linkByParameter: {
businessSid: '',
comment: '',
instanceId: '',
taskId: '',
orgSidPath: '',
taskDefKey: '',
userSid: ''
}
}
},
created() {
console.log('url:' + window.location.href)
var one = window.location.href.indexOf('&data') + 6
const data = window.location.href.substr(one) // urlunescape()web,使
const obj = JSON.parse(decodeURIComponent(data))
console.log('iframe页面获取的obj:', obj)
//
this.linkByParameter.businessSid = obj.businessSid
this.linkByParameter.instanceId = obj.instanceId
this.linkByParameter.taskId = obj.taskId
this.linkByParameter.taskDefKey = obj.taskDefKey
this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
//
this.showInfo(obj.businessSid)
},
mounted() {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 2,
data: 400 + 'px'
}
}, '*')
},
methods: {
showInfo(sid) {
this.viewTitle = '工单索赔调整申请详情'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
req.fetchDetailsBySid({ sid: sid }).then((res) => {
if (res.success) {
this.formobj = res.data
this.formobj.instanceId = res.data.procInstId
if (this.formobj.fileList.length > 0) {
const aa = []
this.formobj.fileList.forEach((e) => {
aa.push(e.url)
})
this.formobj.fileList = aa
}
}
})
},
/** 确认撤回任务 */
openRevoke() {
this.$confirm('是否确认执行撤回操作', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.handleRevoke()
}).catch(() => {
this.$message({
type: 'info',
message: '已取消撤回'
})
})
},
/** 撤回任务 */
handleRevoke() {
req.revokeProcess(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
}
}
}
</script>
<style scoped>
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
</style>

12
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java

@ -93,7 +93,15 @@ public class AsBusrepairBill extends BaseEntity {
private String groupName;
@ApiModelProperty("应收金额")
private BigDecimal receivableAmount;
@ApiModelProperty("工时费")
private BigDecimal hourAmount;
@ApiModelProperty("材料费")
private BigDecimal goodsAmount;
@ApiModelProperty("外出费")
private BigDecimal outAmount;
@ApiModelProperty("厂家补助")
private BigDecimal subsidyAmount;
@ApiModelProperty("其他费用")
private BigDecimal otherAmount;
}

10
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDetailsVo.java

@ -20,6 +20,16 @@ public class AsBusrepairBillDetailsVo implements Vo {
private String orgPath;
@ApiModelProperty("应收金额")
private String receivableAmount;
@ApiModelProperty("工时费")
private String hourAmount;
@ApiModelProperty("材料费")
private String goodsAmount;
@ApiModelProperty("外出费")
private String outAmount;
@ApiModelProperty("厂家补助")
private String subsidyAmount;
@ApiModelProperty("其他费用")
private String otherAmount;
@ApiModelProperty("班组sid")
private String groupSid;
private String createDate;

10
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDto.java

@ -20,6 +20,16 @@ public class AsBusrepairBillDto implements Dto {
private String orgPath;
@ApiModelProperty("应收金额")
private String receivableAmount;
@ApiModelProperty("工时费")
private String hourAmount;
@ApiModelProperty("材料费")
private String goodsAmount;
@ApiModelProperty("外出费")
private String outAmount;
@ApiModelProperty("厂家补助")
private String subsidyAmount;
@ApiModelProperty("其他费用")
private String otherAmount;
@ApiModelProperty("班组sid")
private String groupSid;
@ApiModelProperty("班组名称")

1
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailSDto.java

@ -70,4 +70,5 @@ public class AsBusrepairInventorybillDetailSDto {
private String operUserSid;
@ApiModelProperty("领料人姓名")
private String operName;
private String remarks;
}

3
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillMapper.xml

@ -9,7 +9,8 @@
b.billNo as sourceBillNo,
a.createByName,
a.busTypeValue,
a.warehouseManager
a.warehouseManager,
a.remarks
from as_busrepair_inventorybill as a
left join as_busrepair_bill as b on a.sourceBillSid = b.sid
left join anrui_portal.sys_organization as s on a.deptSid = s.sid

2
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillRest.java

@ -46,7 +46,7 @@ public class AsBusrepairInventorybillRest {
return asBusrepairInventorybillService.newQuitBill(dto);
}
@PostMapping("/details")
@GetMapping("/details")
@ApiOperation("详情")
ResultBean<InventoryBillDetailsVo> details(@RequestParam("sid") String sid) {
return asBusrepairInventorybillService.details(sid);

5
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java

@ -356,6 +356,11 @@ public class AsBusrepairInventorybillService extends MybatisBaseService<AsBusrep
for (AsBusrepairInventorybillDetail goodsDetail : goodsDetails) {
AsBusrepairInventorybillDetailSDto goodsDetailsVo = new AsBusrepairInventorybillDetailSDto();
BeanUtil.copyProperties(goodsDetail, goodsDetailsVo);
if (null != goodsDetail.getCurrentCount()) {
goodsDetailsVo.setOutboundCount(goodsDetail.getCurrentCount().toString());
} else {
goodsDetailsVo.setOutboundCount("0");
}
list.add(goodsDetailsVo);
}
vo.setDetailList(list);

27
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.xml

@ -15,25 +15,18 @@
</select>
<select id="getDetailsByBillSid"
resultType="com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetail">
SELECT
d.*
FROM
as_busrepair_inventorybill AS b
LEFT JOIN as_busrepair_inventorybill_detail AS d ON b.sid = d.billSid
WHERE
b.sourceBillSid = #{busRepairBillSid}
and b.busTypeKey = #{busTypeKey}
SELECT d.*
FROM as_busrepair_inventorybill AS b
LEFT JOIN as_busrepair_inventorybill_detail AS d ON b.sid = d.billSid
WHERE b.sourceBillSid = #{busRepairBillSid}
and b.busTypeKey = #{busTypeKey}
</select>
<select id="getGoodsDetailsByBillSid"
resultType="com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetail">
SELECT
d.*
FROM
as_busrepair_inventorybill AS b
LEFT JOIN as_busrepair_inventorybill_detail AS d ON b.sid = d.billSid
WHERE
b.sourceBillSid = #{sid}
GROUP BY
d.goodsID
SELECT d.*
FROM as_busrepair_inventorybill_detail AS d
LEFT JOIN as_busrepair_inventorybill AS b ON b.sid = d.billSid
WHERE b.sourceBillSid = #{sid}
GROUP BY d.goodsID
</select>
</mapper>

11
yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseRackRest.java

@ -3,10 +3,7 @@ package com.yxt.wms.apiadmin.base;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackDto;
import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackQuery;
import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackService;
import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackVo;
import com.yxt.wms.biz.base.wmswarehouserack.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@ -65,4 +62,10 @@ public class WmsWarehouseRackRest {
public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("isEnable")String isEnable) {
return wmsWarehouseRackService.updateIsEnable(sid,isEnable);
}
@ApiOperation("根据库位全码查仓库库区库位信息")
@GetMapping("/selHouseInfoByFullCode")
public ResultBean<WmsHouseInfoVo> selHouseInfoByFullCode(@RequestParam("rackFullCode") String rackFullCode) {
return wmsWarehouseRackService.selHouseInfoByFullCode(rackFullCode);
}
}

27
yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsGoodsTagRest.java

@ -0,0 +1,27 @@
package com.yxt.wms.apiadmin.inventroy;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.wms.biz.inventory.wmsgoodstag.WmsGoodsTagService;
import com.yxt.wms.biz.inventory.wmsoutbill.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
* @description:
* @author: dimengzhe
* @date: 2024/4/24
**/
@Api(tags = "商品标签表")
@RestController
@RequestMapping("/apiadmin/WmsGoodsTag")
public class WmsGoodsTagRest {
@Autowired
private WmsGoodsTagService wmsWmsGoodsTagService;
}

22
yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsShelfBillRest.java

@ -7,8 +7,7 @@ import com.yxt.wms.biz.inventory.wmsreceiptbill.WmsReceiptBillDto2;
import com.yxt.wms.biz.inventory.wmsreceiptbill.WmsReceiptBillPageVo;
import com.yxt.wms.biz.inventory.wmsreceiptbill.WmsReceiptBillQuery;
import com.yxt.wms.biz.inventory.wmsshelfbill.*;
import com.yxt.wms.biz.inventory.wmsshelfbill.app.AppShelfBillListQuery;
import com.yxt.wms.biz.inventory.wmsshelfbill.app.AppShelfBillListVo;
import com.yxt.wms.biz.inventory.wmsshelfbill.app.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
@ -75,12 +74,29 @@ public class WmsShelfBillRest {
//---------------------------app---------------------------------
@ApiOperation("分页列表")
@PostMapping("/applistPage")
@PostMapping("/getShelvesList")
public ResultBean<PagerVo<AppShelfBillListVo>> applistPage(@RequestBody PagerQuery<AppShelfBillListQuery> pq) {
ResultBean<PagerVo<AppShelfBillListVo>> rb = ResultBean.fireFail();
PagerVo<AppShelfBillListVo> pv = wmsShelfBillService.applistPage(pq);
return rb.success().setData(pv);
}
@ApiOperation("上架初始化")
@GetMapping("shelvesOperaInit/{sid}")
public ResultBean<AppShelInitVo> shelvesOperaInit(@PathVariable("sid") String sid) {
return wmsShelfBillService.shelvesOperaInit(sid);
}
@ApiOperation("扫码")
@GetMapping("scan")
public ResultBean<AppScanVo> scan(@RequestParam(value = "shelvesId", required = false) String shelvesId,@RequestParam(value = "content") String content) {
return wmsShelfBillService.scan(shelvesId,content);
}
@ApiOperation("上架保存")
@PostMapping("/shelvesSave")
public ResultBean shelvesSave(@RequestBody AppSaveBillRecordDto dto) {
return wmsShelfBillService.shelvesSave(dto);
}
}

20
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsHouseInfoVo.java

@ -0,0 +1,20 @@
package com.yxt.wms.biz.base.wmswarehouserack;
import lombok.Data;
/**
* @author Fan
* @description
* @date 2024/5/30 11:29
*/
@Data
public class WmsHouseInfoVo {
private String warehouseSid;//仓库
private String warehouseName;
private String wareAreaSid;//库区
private String wareAreaName;
private String warehouseRackSid;//库位sid
private String warehouseRackCode;
private String warehouseRackName;
}

1
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRack.java

@ -23,4 +23,5 @@ public class WmsWarehouseRack extends BaseEntity {
private String rackCode;//货架编码
private String warehouseSid;//仓库sid
private String locationSid;//库位sid
private String rackFullCode;//库位全码(仓库编码-库区编码-库位编码)
}

2
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.java

@ -23,4 +23,6 @@ public interface WmsWarehouseRackMapper extends BaseMapper<WmsWarehouseRack> {
WmsWarehouseRack checkForInsert(@Param("rackCode")String rackCode, @Param("locationSid")String locationSid);
WmsWarehouseRack checkForUpdate(@Param("rackCode")String rackCode,@Param("locationSid") String locationSid, @Param("sid")String sid);
WmsWarehouseRack selHouseInfoByFullCode(@Param("rackFullCode") String rackFullCode);
}

3
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackMapper.xml

@ -35,6 +35,9 @@ where rackCode =#{rackCode} and locationSid =#{locationSid} and isDelete=0
from wms_warehouse_rack
where rackCode =#{rackCode} and locationSid =#{locationSid} and sid !=#{sid} and isDelete=0
</select>
<select id="selHouseInfoByFullCode" resultType="com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRack">
select * from wms_warehouse_rack where rackFullCode =#{rackFullCode}
</select>
<update id="updateBySidIsDelete">
UPDATE wms_warehouse_rack
SET isDelete=1

83
yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouserack/WmsWarehouseRackService.java

@ -11,7 +11,10 @@ import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseArea;
import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaService;
import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaVo;
import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfo;
import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfoService;
import com.yxt.wms.feign.portal.privilege.PrivilegeQuery;
import com.yxt.wms.feign.portal.sysuser.SysUserFeign;
import org.springframework.beans.factory.annotation.Autowired;
@ -31,6 +34,10 @@ import java.util.stream.Collectors;
public class WmsWarehouseRackService extends MybatisBaseService<WmsWarehouseRackMapper, WmsWarehouseRack> {
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private WmsWarehouseInfoService wmsWarehouseInfoService;
@Autowired
private WmsWarehouseAreaService wmsWarehouseAreaService;
public ResultBean<PagerVo<WmsWarehouseRackVo>> listPage(PagerQuery<WmsWarehouseRackQuery> pq) {
ResultBean rb = ResultBean.fireFail();
@ -72,29 +79,30 @@ public class WmsWarehouseRackService extends MybatisBaseService<WmsWarehouseRack
PagerVo<WmsWarehouseRackVo> p = new PagerVo<>();
return rb.success().setData(p);
}
if(StringUtils.isNotBlank(query.getName())){
qw.like("rackName",query.getName());
if (StringUtils.isNotBlank(query.getName())) {
qw.like("rackName", query.getName());
}
if(StringUtils.isNotBlank(query.getCode())){
qw.like("rackCode",query.getCode());
if (StringUtils.isNotBlank(query.getCode())) {
qw.like("rackCode", query.getCode());
}
if(StringUtils.isNotBlank(query.getAreaTypeSid())){
qw.eq("b.sid",query.getAreaTypeSid());
if (StringUtils.isNotBlank(query.getAreaTypeSid())) {
qw.eq("b.sid", query.getAreaTypeSid());
}
if(StringUtils.isNotBlank(query.getWarehouseSid())){
qw.eq("c.sid",query.getWarehouseSid());
if (StringUtils.isNotBlank(query.getWarehouseSid())) {
qw.eq("c.sid", query.getWarehouseSid());
}
qw.ne("a.isDelete","1");
qw.ne("a.isDelete", "1");
IPage<WmsWarehouseRack> page = PagerUtil.queryToPage(pq);
IPage<WmsWarehouseRackVo> pagging = baseMapper.listPage(page, qw);
PagerVo<WmsWarehouseRackVo> p = PagerUtil.pageToVo(pagging, null);
List<WmsWarehouseRackVo> records = pagging.getRecords();
return rb.success().setData(p);
}
public ResultBean<WmsWarehouseRackVo> getAllType() {
ResultBean rb = ResultBean.fireFail();
List<WmsWarehouseRack> pagging = baseMapper.selectList(new QueryWrapper<WmsWarehouseRack>().eq("isEnable",1)
.ne("isDelete","1"));
List<WmsWarehouseRack> pagging = baseMapper.selectList(new QueryWrapper<WmsWarehouseRack>().eq("isEnable", 1)
.ne("isDelete", "1"));
return rb.success().setData(pagging);
}
@ -103,16 +111,27 @@ public class WmsWarehouseRackService extends MybatisBaseService<WmsWarehouseRack
String sid = "";
if (StringUtils.isNotBlank(dto.getSid())) {
sid = dto.getSid();
WmsWarehouseRack rack = baseMapper.checkForUpdate(dto.getRackCode(),dto.getLocationSid(),sid);
WmsWarehouseRack rack = baseMapper.checkForUpdate(dto.getRackCode(), dto.getLocationSid(), sid);
if (null != rack) {
return rb.setMsg("同一个库区下的库位编码不能重复。");
}
WmsWarehouseRack wmsWarehouseRack = fetchBySid(dto.getSid());
BeanUtil.copyProperties(dto, wmsWarehouseRack, "id", "sid");
wmsWarehouseRack.setModifyTime(new Date());
String houseCode = "";
String areaCode = "";
WmsWarehouseInfo warehouseInfo = wmsWarehouseInfoService.fetchBySid(dto.getWarehouseSid());
if (null != warehouseInfo) {
houseCode = warehouseInfo.getWarehouseCode();
}
WmsWarehouseArea wmsWarehouseArea = wmsWarehouseAreaService.fetchBySid(dto.getLocationSid());
if (null != wmsWarehouseArea) {
areaCode = wmsWarehouseArea.getAreaCode();
}
wmsWarehouseRack.setRackFullCode(houseCode + "-" + areaCode + "-" + dto.getRackCode());
baseMapper.updateById(wmsWarehouseRack);
} else {
WmsWarehouseRack rack = baseMapper.checkForInsert(dto.getRackCode(),dto.getLocationSid());
WmsWarehouseRack rack = baseMapper.checkForInsert(dto.getRackCode(), dto.getLocationSid());
if (null != rack) {
return rb.setMsg("同一个库区下的库位编码不能重复。");
}
@ -121,6 +140,17 @@ public class WmsWarehouseRackService extends MybatisBaseService<WmsWarehouseRack
BeanUtil.copyProperties(dto, wmsWarehouseRack, "id", "sid");
wmsWarehouseRack.setCreateTime(new DateTime());
wmsWarehouseRack.setCreateBySid(dto.getUserSid());
String houseCode = "";
String areaCode = "";
WmsWarehouseInfo warehouseInfo = wmsWarehouseInfoService.fetchBySid(dto.getWarehouseSid());
if (null != warehouseInfo) {
houseCode = warehouseInfo.getWarehouseCode();
}
WmsWarehouseArea wmsWarehouseArea = wmsWarehouseAreaService.fetchBySid(dto.getLocationSid());
if (null != wmsWarehouseArea) {
areaCode = wmsWarehouseArea.getAreaCode();
}
wmsWarehouseRack.setRackFullCode(houseCode + "-" + areaCode + "-" + dto.getRackCode());
baseMapper.insert(wmsWarehouseRack);
}
return rb.success().setMsg("成功");
@ -141,11 +171,12 @@ public class WmsWarehouseRackService extends MybatisBaseService<WmsWarehouseRack
}
return rb.success();
}
public void delAll(String[] sids) {
int count = baseMapper.updateBySidIsDelete(Arrays.stream(sids).collect(Collectors.toList()));
}
public ResultBean updateIsEnable(String sid,String isEnable) {
public ResultBean updateIsEnable(String sid, String isEnable) {
ResultBean rb = ResultBean.fireFail();
WmsWarehouseRack wmsWarehouseRack = fetchBySid(sid);
if (null != wmsWarehouseRack) {
@ -154,4 +185,28 @@ public class WmsWarehouseRackService extends MybatisBaseService<WmsWarehouseRack
}
return rb.success().setMsg("成功");
}
public ResultBean<WmsHouseInfoVo> selHouseInfoByFullCode(String rackFullCode) {
ResultBean rb = ResultBean.fireFail();
WmsHouseInfoVo info = new WmsHouseInfoVo();
WmsWarehouseRack rack = baseMapper.selHouseInfoByFullCode(rackFullCode);
if (null != rack) {
info.setWarehouseRackSid(rack.getSid());
info.setWarehouseRackName(rack.getRackName());
info.setWarehouseRackCode(rack.getRackCode());
WmsWarehouseInfo warehouseInfo = wmsWarehouseInfoService.fetchBySid(rack.getWarehouseSid());
if (null != warehouseInfo) {
info.setWarehouseSid(warehouseInfo.getSid());
info.setWarehouseName(warehouseInfo.getWarehouseName());
}
WmsWarehouseArea wmsWarehouseArea = wmsWarehouseAreaService.fetchBySid(rack.getLocationSid());
if (null != wmsWarehouseArea) {
info.setWareAreaSid(wmsWarehouseArea.getSid());
info.setWareAreaName(wmsWarehouseArea.getAreaName());
}
} else {
return rb;
}
return rb.success().setData(info);
}
}

45
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTag.java

@ -0,0 +1,45 @@
package com.yxt.wms.biz.inventory.wmsgoodstag;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* @author Fan
* @description
* @date 2024/5/30 13:36
*/
@Data
public class WmsGoodsTag extends BaseEntity {
@ApiModelProperty("单据sid(收货单sid)")
private String billSid;
@ApiModelProperty("单据明细sid")
private String billDetailSid;
@ApiModelProperty("批次号(入库日期+有效日期,如240320-241009)")
private String batchNumber;
@ApiModelProperty("商品ID")
private String goodsID;
@ApiModelProperty("商品基础信息sid")
private String goodSpuSid;
@ApiModelProperty("商品名称")
private String goodsSpuName;
@ApiModelProperty("商品Skusid")
private String goodsSkuSid;
@ApiModelProperty("商品Sku名称")
private String goodsSkuTitle;
@ApiModelProperty("商品编码(图号)")
private String goodsSkuCode;
@ApiModelProperty("规格型号")
private String goodsSkuOwnSpec;
@ApiModelProperty("计量单位")
private String unit;
@ApiModelProperty("数量")
private BigDecimal goodsCount;
@ApiModelProperty("标签图片地址")
private String tagPicUrl;
@ApiModelProperty("打印次数")
private Integer printCount;
}

17
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagMapper.java

@ -0,0 +1,17 @@
package com.yxt.wms.biz.inventory.wmsgoodstag;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* @description:
* @author: dimengzhe
* @date: 2024/4/11
**/
@Mapper
public interface WmsGoodsTagMapper extends BaseMapper<WmsGoodsTag> {
WmsGoodsTag selByBillSidAndGoodsID(@Param("billSid") String billSid, @Param("goodsID") String goodsID);
}

8
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagMapper.xml

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.wms.biz.inventory.wmsgoodstag.WmsGoodsTagMapper">
<select id="selByBillSidAndGoodsID" resultType="com.yxt.wms.biz.inventory.wmsgoodstag.WmsGoodsTag">
select * from wms_goods_tag where billSid =#{billSid} and goodsID =#{goodsID}
</select>
</mapper>

19
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagService.java

@ -0,0 +1,19 @@
package com.yxt.wms.biz.inventory.wmsgoodstag;
import com.yxt.common.base.service.MybatisBaseService;
import org.springframework.stereotype.Service;
/**
* @description:
* @author: dimengzhe
* @date: 2024/4/11
**/
@Service
public class WmsGoodsTagService extends MybatisBaseService<WmsGoodsTagMapper, WmsGoodsTag> {
public WmsGoodsTag selByBillSidAndGoodsID(String billSid, String goodsID) {
return baseMapper.selByBillSidAndGoodsID(billSid,goodsID);
}
}

2
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillInventoryQuery.java

@ -30,6 +30,6 @@ public class WmsOutBillInventoryQuery implements Query {
private String orgPath;
private String busrepairBillSid;//维修工单sid
private String busrepairBillsid;//维修工单sid
private String name;
}

1
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillMapper.xml

@ -36,6 +36,7 @@
wi.goodsSpuName,
wi.goodsSkuTitle,
wi.goodsSkuCode,
wi.goodsSkuSid,
wi.goodsSkuOwnSpec,
wi.unit,
wi.warehouseSid,

8
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillService.java

@ -149,18 +149,18 @@ public class WmsOutBillService extends MybatisBaseService<WmsOutBillMapper, WmsO
}*/
IPage<WmsOutBill> page = PagerUtil.queryToPage(pagerQuery);
IPage<WmsOutBillInventoryVo> pagging = baseMapper.getInventoryList(page, qw);
if (StringUtils.isNotBlank(query.getBusrepairBillSid())) {
if (StringUtils.isNotBlank(query.getBusrepairBillsid())) {
List<WmsOutBillInventoryVo> records = pagging.getRecords();
for (WmsOutBillInventoryVo record : records) {
//维修出入库查询已出库数量
String billSid = query.getBusrepairBillSid();
String billSid = query.getBusrepairBillsid();
String chuKuCount = asBusrepairInventorybillFeign.selOutBoundCount(billSid, "0", record.getGoodsID()).getData();
String ruKuCount = asBusrepairInventorybillFeign.selOutBoundCount(billSid, "1", record.getGoodsID()).getData();
BigDecimal count = new BigDecimal(chuKuCount).subtract(new BigDecimal(ruKuCount));
if (null != count) {
record.setOutboundCount("0");
} else {
record.setOutboundCount(count.toString());
} else {
record.setOutboundCount("0");
}
}
}

89
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java

@ -205,33 +205,35 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp
wmsReceiptBillDetail.setBillSid(sid);
wmsReceiptBillDetailService.insert(wmsReceiptBillDetail);
}
WmsAnsBill wmsAnsBill = wmsAnsBillService.fetchBySid(dto.getSourceBillSid());
List<WmsAnsListDetailsVo> vos = wmsAnsBillDetailService.selectByBillSid(dto.getSourceBillSid());
if (!vos.isEmpty()) {
HashSet<Integer> integers = new HashSet<>();
for (WmsAnsListDetailsVo vo : vos) {
BigDecimal count = new BigDecimal("0");
if (StringUtils.isNotBlank(vo.getWaitInCount())) {
count = new BigDecimal(vo.getWaitInCount());
if (StringUtils.isNotBlank(dto.getSourceBillSid())) {
WmsAnsBill wmsAnsBill = wmsAnsBillService.fetchBySid(dto.getSourceBillSid());
List<WmsAnsListDetailsVo> vos = wmsAnsBillDetailService.selectByBillSid(dto.getSourceBillSid());
if (!vos.isEmpty()) {
HashSet<Integer> integers = new HashSet<>();
for (WmsAnsListDetailsVo vo : vos) {
BigDecimal count = new BigDecimal("0");
if (StringUtils.isNotBlank(vo.getWaitInCount())) {
count = new BigDecimal(vo.getWaitInCount());
}
if (count.compareTo(BigDecimal.ZERO) <= 0) {
integers.add(2);
} else {
integers.add(1);
}
}
if (count.compareTo(BigDecimal.ZERO) <= 0) {
integers.add(2);
if (integers.size() > 1) {
wmsAnsBill.setBillState(1);
} else {
integers.add(1);
}
}
if (integers.size() > 1) {
wmsAnsBill.setBillState(1);
} else {
wmsAnsBill.setBillState(2);
for (Integer integer : integers) {
if (integer == 1) {
wmsAnsBill.setBillState(1);
wmsAnsBill.setBillState(2);
for (Integer integer : integers) {
if (integer == 1) {
wmsAnsBill.setBillState(1);
}
}
}
}
wmsAnsBillService.updateById(wmsAnsBill);
}
wmsAnsBillService.updateById(wmsAnsBill);
}
wmsReceiptBill.setBillState("0");
String applyCode = getApplyCode(dto.getCreateOrgSid());
@ -276,33 +278,36 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp
wmsReceiptBillDetail.setBillSid(sid);
wmsReceiptBillDetailService.insert(wmsReceiptBillDetail);
}
WmsAnsBill wmsAnsBill = wmsAnsBillService.fetchBySid(dto.getSourceBillSid());
List<WmsAnsListDetailsVo> vos = wmsAnsBillDetailService.selectByBillSid(dto.getSourceBillSid());
if (!vos.isEmpty()) {
HashSet<Integer> integers = new HashSet<>();
for (WmsAnsListDetailsVo vo : vos) {
BigDecimal count = new BigDecimal("0");
if (StringUtils.isNotBlank(vo.getWaitInCount())) {
count = new BigDecimal(vo.getWaitInCount());
if (StringUtils.isNotBlank(dto.getSourceBillSid())) {
WmsAnsBill wmsAnsBill = wmsAnsBillService.fetchBySid(dto.getSourceBillSid());
List<WmsAnsListDetailsVo> vos = wmsAnsBillDetailService.selectByBillSid(dto.getSourceBillSid());
if (!vos.isEmpty()) {
HashSet<Integer> integers = new HashSet<>();
for (WmsAnsListDetailsVo vo : vos) {
BigDecimal count = new BigDecimal("0");
if (StringUtils.isNotBlank(vo.getWaitInCount())) {
count = new BigDecimal(vo.getWaitInCount());
}
if (count.compareTo(BigDecimal.ZERO) <= 0) {
integers.add(2);
} else {
integers.add(1);
}
}
if (count.compareTo(BigDecimal.ZERO) <= 0) {
integers.add(2);
if (integers.size() > 1) {
wmsAnsBill.setBillState(1);
} else {
integers.add(1);
}
}
if (integers.size() > 1) {
wmsAnsBill.setBillState(1);
} else {
wmsAnsBill.setBillState(2);
for (Integer integer : integers) {
if (integer == 1) {
wmsAnsBill.setBillState(1);
wmsAnsBill.setBillState(2);
for (Integer integer : integers) {
if (integer == 1) {
wmsAnsBill.setBillState(1);
}
}
}
}
wmsAnsBillService.updateById(wmsAnsBill);
}
wmsAnsBillService.updateById(wmsAnsBill);
}
baseMapper.updateById(wmsReceiptBill);
}

3
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBill.java

@ -21,7 +21,8 @@ public class WmsShelfBill extends BaseEntity {
private String createByName;
@ApiModelProperty("0新建,1已完成")
private Integer billState;
@ApiModelProperty("0新建,1已完成")
private String billStateValue;
private String createOrgSid;
private String useOrgSid;
private String deptSid;

3
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillMapper.java

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.wms.biz.inventory.wmsshelfbill.app.AppShelfBillListVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -21,4 +22,6 @@ public interface WmsShelfBillMapper extends BaseMapper<WmsShelfBill> {
String selectNum(String goodsId);
String selectCodeNum(String bill);
IPage<AppShelfBillListVo> applistPage(IPage<WmsShelfBill> page, @Param(Constants.WRAPPER) QueryWrapper<WmsShelfBill> qw);
}

15
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillMapper.xml

@ -54,4 +54,19 @@
order by id desc
limit 1
</select>
<select id="applistPage" resultType="com.yxt.wms.biz.inventory.wmsshelfbill.app.AppShelfBillListVo">
select wsb.sid shelvesSid,
wsb.billNo shelvesId,
DATE_FORMAT(wsb.createTime, '%Y-%m-%d') as shelvesCreateTime,
wsb.upShelfName shelvesUsers,
wsb.sourceBillNo receivingId,
wsb.billStateValue shelvesState,
r.createByName receivingUser
from wms_shelf_bill wsb
LEFT JOIN wms_receipt_bill as r ON wsb.sourceBillSid = r.sid
LEFT JOIN anrui_portal.sys_organization as s ON wsb.deptSid = s.sid
<where>
${ew.sqlSegment}
</where>
</select>
</mapper>

261
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java

@ -10,7 +10,12 @@ import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.wms.biz.base.wmswarehouserack.WmsHouseInfoVo;
import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackService;
import com.yxt.wms.biz.inventory.wmsansbill.WmsAnsBillVo;
import com.yxt.wms.biz.inventory.wmsansbilldetail.WmsAnsListDetailsVo;
import com.yxt.wms.biz.inventory.wmsgoodstag.WmsGoodsTag;
import com.yxt.wms.biz.inventory.wmsgoodstag.WmsGoodsTagService;
import com.yxt.wms.biz.inventory.wmsinventory.WmsInventorySaveDto;
import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryService;
import com.yxt.wms.biz.inventory.wmsinventoryrecord.WmsInventoryRecordDto;
@ -22,8 +27,7 @@ import com.yxt.wms.biz.inventory.wmsreceiptbilldetail.WmsReceiptBillDetailDto2;
import com.yxt.wms.biz.inventory.wmsreceiptbilldetail.WmsReceiptBillDetailService;
import com.yxt.wms.biz.inventory.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatch;
import com.yxt.wms.biz.inventory.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatchService;
import com.yxt.wms.biz.inventory.wmsshelfbill.app.AppShelfBillListQuery;
import com.yxt.wms.biz.inventory.wmsshelfbill.app.AppShelfBillListVo;
import com.yxt.wms.biz.inventory.wmsshelfbill.app.*;
import com.yxt.wms.biz.inventory.wmsshelfbilldetail.*;
import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuDetailsVo;
import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuFeign;
@ -38,13 +42,11 @@ import com.yxt.wms.utils.Rule;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.*;
/**
* @description:
@ -77,6 +79,11 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private WmsWarehouseRackService wmsWarehouseRackService;
@Autowired
private WmsGoodsTagService wmsGoodsTagService;
public PagerVo<WmsShelfBillVo> listPage(PagerQuery<WmsShelfBillQuery> pq) {
WmsShelfBillQuery query = pq.getParams();
QueryWrapper<WmsShelfBill> qw = new QueryWrapper<>();
@ -143,7 +150,7 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
if (StringUtils.isBlank(sid)) {
WmsShelfBill wmsShelfBill = new WmsShelfBill();
if (StringUtils.isNotBlank(dto.getBillState())) {
if (dto.getBillState().equals("新建")){
if (dto.getBillState().equals("新建")) {
dto.setBillState("0");
} else if (dto.getBillState().equals("完成")) {
dto.setBillState("1");
@ -159,6 +166,13 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
}
String applyCode = getApplyCode(dto.getCreateOrgSid());
wmsShelfBill.setBillNo(applyCode);
if (StringUtils.isNotBlank(dto.getBillState())) {
if (dto.getBillState().equals("0")) {
wmsShelfBill.setBillStateValue("新建");
} else if (dto.getBillState().equals("1")) {
wmsShelfBill.setBillStateValue("完成");
}
}
baseMapper.insert(wmsShelfBill);
} else {
WmsShelfBill wmsShelfBill = fetchBySid(sid);
@ -166,7 +180,7 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
return rb.setMsg("该单据不存在");
}
if (StringUtils.isNotBlank(dto.getBillState())) {
if (dto.getBillState().equals("新建")){
if (dto.getBillState().equals("新建")) {
dto.setBillState("0");
} else if (dto.getBillState().equals("完成")) {
dto.setBillState("1");
@ -179,6 +193,13 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
if (!list.isEmpty()) {
wmsShelfBillDetailService.saveShelfDetails(sid, list);
}
if (StringUtils.isNotBlank(dto.getBillState())) {
if (dto.getBillState().equals("0")) {
wmsShelfBill.setBillStateValue("新建");
} else if (dto.getBillState().equals("1")) {
wmsShelfBill.setBillStateValue("完成");
}
}
baseMapper.updateById(wmsShelfBill);
}
@ -394,12 +415,224 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
}
public PagerVo<AppShelfBillListVo> applistPage(PagerQuery<AppShelfBillListQuery> pq) {
PagerVo<AppShelfBillListVo> p = new PagerVo<>();
List<AppShelfBillListVo> list = new ArrayList<>();
AppShelfBillListVo v = new AppShelfBillListVo();
v.setSid("222");
list.add(v);
p.setRecords(list);
AppShelfBillListQuery query = pq.getParams();
QueryWrapper<WmsShelfBill> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getUserSid())) {
qw.eq("wsb.upShelfSid", query.getUserSid());
}
//ToDo:添加查询条件
if (StringUtils.isNotBlank(query.getName())) {
qw.and(wrapper -> wrapper.like("wsb.billNo", query.getName())
.or().like("wsb.sourceBillNo", query.getName())
.or().like("wsb.billStateValue", query.getName())
);
}
qw.ne("wsb.billStateValue", "已完成");
IPage<WmsShelfBill> page = PagerUtil.queryToPage(pq);
IPage<AppShelfBillListVo> pagging = baseMapper.applistPage(page, qw);
List<AppShelfBillListVo> records = pagging.getRecords();
if (!records.isEmpty()) {
for (AppShelfBillListVo record : records) {
if (!record.getShelvesState().equals("完成")) {
record.setShelvesBtn(true);
}
if (!record.getShelvesState().equals("新建")) {
record.setRecordBtn(true);
}
}
}
PagerVo<AppShelfBillListVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean<AppShelInitVo> shelvesOperaInit(String sid) {
ResultBean rb = ResultBean.fireFail();
AppShelInitVo vo = new AppShelInitVo();
WmsShelfBill wmsShelfBill = fetchBySid(sid);
if (null != wmsShelfBill) {
vo.setShelvesId(wmsShelfBill.getBillNo());
List<WmsShelfBillDetail> details = wmsShelfBillDetailService.selectByMainSid(sid);
if (!details.isEmpty()) {
List<AppShelInitVo.AppShelInitVoDetails> goods = new ArrayList<>();
for (WmsShelfBillDetail detail : details) {
AppShelInitVo.AppShelInitVoDetails voDetails = new AppShelInitVo.AppShelInitVoDetails();
if (StringUtils.isNotBlank(detail.getGoodsSpuName())) {
voDetails.setName(detail.getGoodsSpuName());
}
BigDecimal count = new BigDecimal("0");
BigDecimal acCount = new BigDecimal("0");
if (null != detail.getCount()) {
count = detail.getCount();
}
if (null != detail.getActualCount()) {
acCount = detail.getActualCount();
}
String c = String.valueOf(count.subtract(acCount).intValue());
voDetails.setNumber(c);
if (!c.equals("0")) {
goods.add(voDetails);
}
}
vo.setGoods(goods);
}
}
return rb.success().setData(vo);
}
public ResultBean<AppScanVo> scan(String shelvesId, String content) {
ResultBean rb = ResultBean.fireFail();
AppScanVo vo = new AppScanVo();
if (StringUtils.isNotBlank(shelvesId)) {
if (content.contains("#")) {
String[] split = content.split("#");
String houseCode = split[0];
ResultBean<WmsHouseInfoVo> wmsHouseInfoVoResultBean = wmsWarehouseRackService.selHouseInfoByFullCode(houseCode);
if (wmsHouseInfoVoResultBean.getSuccess()) {
WmsHouseInfoVo houseInfoVo = wmsHouseInfoVoResultBean.getData();
if (null != houseInfoVo) {
vo.setHouseCode(houseCode);
vo.setHouseName(houseInfoVo.getWareAreaName() + "-" + houseInfoVo.getWarehouseRackName());
vo.setHouseAddress(houseInfoVo.getWarehouseRackCode());
vo.setType(1);
}
} else {
return rb.setMsg("扫描库位码为空");
}
} else {
vo.setType(0);
WmsShelfBill wmsShelfBill = fetchBySid(shelvesId);
String sourceBillSid = wmsShelfBill.getSourceBillSid();
//判断该商品ID是否属于该上架单对应的收货单
WmsGoodsTag wmsGoodsTag = wmsGoodsTagService.selByBillSidAndGoodsID(sourceBillSid, content);
if (null != wmsGoodsTag) {
vo.setGoodsID(wmsGoodsTag.getGoodsID());
vo.setGoodsName(wmsGoodsTag.getGoodsSpuName());
if (wmsGoodsTag.getState() == 1) {
return rb.setMsg("该商品已上架完成");
}
//获取该商品编码,判断此上架单是否有对应的商品编码
String goodsSkuCode = wmsGoodsTag.getGoodsSkuCode();
WmsShelfBillDetail shelfBillGoods = wmsShelfBillDetailService.selByBillSidAndSkuCode(shelvesId, goodsSkuCode);
if (null == shelfBillGoods) {
return rb.setMsg("该商品不属于您的上架单");
}
BigDecimal count = new BigDecimal("0");
BigDecimal acCount = new BigDecimal("0");
if (null != shelfBillGoods.getCount()) {
count = shelfBillGoods.getCount();
}
if (null != shelfBillGoods.getActualCount()) {
acCount = shelfBillGoods.getActualCount();
}
BigDecimal subtractCount = count.subtract(acCount);
if (subtractCount.compareTo(BigDecimal.ZERO) > 0) {
if (wmsGoodsTag.getGoodsCount().compareTo(new BigDecimal("1")) == 0) {
vo.setGoodsMax("1");
} else {
vo.setGoodsMax(String.valueOf(subtractCount.intValue()));
}
} else {
return rb.setMsg("您的上架单中的该商品已经上架完成");
}
} else {
return rb.setMsg("该商品不属于您的收货单");
}
}
} else {
vo.setUrl("");
}
return rb.success().setData(vo);
}
@Transactional(rollbackFor = Exception.class)
public ResultBean shelvesSave(AppSaveBillRecordDto dto) {
ResultBean rb = ResultBean.fireFail();
String shelvesId = dto.getShelvesSid();
WmsShelfBill wmsShelfBill = fetchBySid(shelvesId);
String sourceBillSid = wmsShelfBill.getSourceBillSid();
List<AppSaveBillRecordDto.AppSaveBillRecordDetailsDto> goodsList = dto.getGoodsList();
if (!goodsList.isEmpty()) {
Map<String, BigDecimal> map = new HashMap<>();
for (AppSaveBillRecordDto.AppSaveBillRecordDetailsDto detailsDto : goodsList) {
BigDecimal decimal = map.get(detailsDto.getGoodsID());
if (null != decimal) {
map.put(detailsDto.getGoodsID(), decimal.add(new BigDecimal(detailsDto.getCount())));
} else {
map.put(detailsDto.getGoodsID(), new BigDecimal(detailsDto.getCount()));
}
}
for (AppSaveBillRecordDto.AppSaveBillRecordDetailsDto r : goodsList) {
String goodsID = r.getGoodsID();
String houseCode = r.getHouseCode();
if (StringUtils.isBlank(goodsID)) {
return rb.setMsg("请扫描商品码");
}
if (StringUtils.isBlank(houseCode)) {
return rb.setMsg("请扫描库位码");
}
WmsGoodsTag wmsGoodsTag = wmsGoodsTagService.selByBillSidAndGoodsID(sourceBillSid, goodsID);
String goodsSkuCode = wmsGoodsTag.getGoodsSkuCode();
WmsShelfBillDetail shelfBillGoods = wmsShelfBillDetailService.selByBillSidAndSkuCode(shelvesId, goodsSkuCode);
BigDecimal actualCount = shelfBillGoods.getActualCount();
BigDecimal subtract = shelfBillGoods.getCount().subtract(actualCount);
if (subtract.compareTo(map.get(goodsID)) < 0) {
return rb.setMsg("请勿超过商品上架最大数量");
}
}
for (AppSaveBillRecordDto.AppSaveBillRecordDetailsDto r : goodsList) {
String count = r.getCount();
String goodsID = r.getGoodsID();
String houseCode = r.getHouseCode();
WmsGoodsTag wmsGoodsTag = wmsGoodsTagService.selByBillSidAndGoodsID(sourceBillSid, goodsID);
String goodsSkuCode = wmsGoodsTag.getGoodsSkuCode();
WmsShelfBillDetail shelfBillGoods = wmsShelfBillDetailService.selByBillSidAndSkuCode(shelvesId, goodsSkuCode);
BigDecimal actualCount = shelfBillGoods.getActualCount();
BigDecimal add = actualCount.add(new BigDecimal(count));
shelfBillGoods.setActualCount(add);
wmsShelfBillDetailService.updateById(shelfBillGoods);
if (wmsGoodsTag.getGoodsCount().compareTo(new BigDecimal("1")) == 0) {
wmsGoodsTag.setState(1);
wmsGoodsTagService.updateById(wmsGoodsTag);
}
}
List<WmsShelfBillDetail> vos = wmsShelfBillDetailService.selectByMainSid(dto.getShelvesSid());
if (!vos.isEmpty()) {
HashSet<Integer> integers = new HashSet<>();
for (WmsShelfBillDetail vo : vos) {
if (vo.getActualCount().compareTo(vo.getCount()) >= 0) {
integers.add(2);
} else {
integers.add(1);
}
}
if (integers.size() > 1) {
wmsShelfBill.setBillState(2);
wmsShelfBill.setBillStateValue("部分上架");
} else {
wmsShelfBill.setBillState(1);
wmsShelfBill.setBillStateValue("已完成");
for (Integer integer : integers) {
if (integer == 1) {
wmsShelfBill.setBillState(2);
wmsShelfBill.setBillStateValue("部分上架");
}
}
}
}
baseMapper.updateById(wmsShelfBill);
for (AppSaveBillRecordDto.AppSaveBillRecordDetailsDto r : goodsList) {
String goodsID = r.getGoodsID();
WmsGoodsTag wmsGoodsTag = wmsGoodsTagService.selByBillSidAndGoodsID(sourceBillSid, goodsID);
String goodsSkuCode = wmsGoodsTag.getGoodsSkuCode();
if (wmsGoodsTag.getGoodsCount().compareTo(new BigDecimal("1")) > 0) {
String count = wmsShelfBillDetailService.selAcCountBySourceBillSidAndSkuCode(sourceBillSid, goodsSkuCode);
if (new BigDecimal(count).compareTo(wmsGoodsTag.getGoodsCount()) >= 0) {
wmsGoodsTag.setState(1);
wmsGoodsTagService.updateById(wmsGoodsTag);
}
}
}
}
return rb.success();
}
}

43
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/app/AppSaveBillRecordDto.java

@ -0,0 +1,43 @@
package com.yxt.wms.biz.inventory.wmsshelfbill.app;
import com.yxt.common.core.dto.Dto;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @author Fan
* @description
* @date 2024/5/30 14:21
*/
@Data
public class AppSaveBillRecordDto implements Dto {
/**
* 商品列表
*/
private List<AppSaveBillRecordDetailsDto> goodsList = new ArrayList<>();
private String orgPath;
/**
* 上架单sid
*/
private String shelvesSid;
private String userSid;
@Data
public static class AppSaveBillRecordDetailsDto {
/**
* 数量
*/
private String count;
/**
* 商品ID
*/
private String goodsID;
/**
* 库位码
*/
private String houseCode;
}
}

44
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/app/AppScanVo.java

@ -0,0 +1,44 @@
package com.yxt.wms.biz.inventory.wmsshelfbill.app;
import lombok.Data;
/**
* @author Fan
* @description
* @date 2024/5/30 11:12
*/
@Data
public class AppScanVo {
/**
* 商品id
*/
private String goodsID;
/**
* 商品最大可上架数量通过shelvesId去查询出来的当前上架单无需上架此商品 false
*/
private String goodsMax;
/**
* 商品名称
*/
private String goodsName;
/**
* 1-2-50
*/
private String houseAddress;
/**
* 库位码
*/
private String houseCode;
/**
* 库区名+库位名
*/
private String houseName;
/**
* 0 商品码 1库位码
*/
private Integer type;
/**
* 网址
*/
private String url;
}

29
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/app/AppShelInitVo.java

@ -0,0 +1,29 @@
package com.yxt.wms.biz.inventory.wmsshelfbill.app;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @author Fan
* @description
* @date 2024/5/30 10:41
*/
@Data
public class AppShelInitVo {
private String shelvesId;
private List<AppShelInitVoDetails> goods = new ArrayList<>();
@Data
public static class AppShelInitVoDetails {
private String name;
private String number;
}
}

43
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/app/AppShelfBillListVo.java

@ -10,11 +10,40 @@ import lombok.Data;
*/
@Data
public class AppShelfBillListVo implements Vo {
private String billNo; //单据编号
private String billState;//单据状态
private String receiptBillNo;//收货单号
private String receiptName;//收货人
private String shelName;//上架人
private String time;//日期
private String sid;
/**
* 收货单号
*/
private String receivingId;
/**
* 收货人
*/
private String receivingUser;
/**
* 记录按钮有记录true
*/
private boolean recordBtn;
/**
* 上架按钮上架还有剩余true
*/
private boolean shelvesBtn;
/**
* 上架单创建时间
*/
private String shelvesCreateTime;
/**
* 上架单编号
*/
private String shelvesId;
/**
* 上架单sid
*/
private String shelvesSid;
/**
* 单据状态
*/
private String shelvesState;
/**
* 上架人
*/
private String shelvesUsers;
}

7
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetailMapper.java

@ -2,6 +2,7 @@ package com.yxt.wms.biz.inventory.wmsshelfbilldetail;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -21,4 +22,10 @@ public interface WmsShelfBillDetailMapper extends BaseMapper<WmsShelfBillDetail>
List<String> selectReceiptSidList();
List<ShelfInitListVo> selDetailsByMainSid(String sid);
List<WmsShelfBillDetail> selectByMainSid(String sid);
WmsShelfBillDetail selByBillSidAndSkuCode(@Param("shelvesId") String shelvesId,@Param("goodsSkuCode") String goodsSkuCode);
String selAcCountBySourceBillSidAndSkuCode(@Param("sourceBillSid")String sourceBillSid, @Param("goodsSkuCode")String goodsSkuCode);
}

20
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetailMapper.xml

@ -48,4 +48,24 @@
from wms_shelf_bill_detail wsd
where billSid = #{sid}
</select>
<select id="selectByMainSid" resultType="com.yxt.wms.biz.inventory.wmsshelfbilldetail.WmsShelfBillDetail">
select *
from wms_shelf_bill_detail where billSid = #{sid}
</select>
<select id="selByBillSidAndSkuCode"
resultType="com.yxt.wms.biz.inventory.wmsshelfbilldetail.WmsShelfBillDetail">
SELECT
*
FROM
wms_shelf_bill_detail AS d
WHERE d.billSid = #{shelvesId} and d.goodsSkuCode = #{goodsSkuCode}
</select>
<select id="selAcCountBySourceBillSidAndSkuCode" resultType="java.lang.String">
SELECT
IFNULL(SUM(d.actualCount),0)
FROM
wms_shelf_bill_detail AS d
LEFT JOIN wms_shelf_bill AS b ON d.billSid = b.sid
WHERE b.sourceBillSid = #{sourceBillSid} and d.goodsSkuCode = #{goodsSkuCode}
</select>
</mapper>

13
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbilldetail/WmsShelfBillDetailService.java

@ -2,6 +2,7 @@ package com.yxt.wms.biz.inventory.wmsshelfbilldetail;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.common.base.service.MybatisBaseService;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Service;
import java.util.List;
@ -38,4 +39,16 @@ public class WmsShelfBillDetailService extends MybatisBaseService<WmsShelfBillDe
public List<ShelfInitListVo> selDetailsByMainSid(String sid) {
return baseMapper.selDetailsByMainSid(sid);
}
public List<WmsShelfBillDetail> selectByMainSid(String sid) {
return baseMapper.selectByMainSid(sid);
}
public WmsShelfBillDetail selByBillSidAndSkuCode(String shelvesId,String goodsSkuCode) {
return baseMapper.selByBillSidAndSkuCode(shelvesId,goodsSkuCode);
}
public String selAcCountBySourceBillSidAndSkuCode(String sourceBillSid, String goodsSkuCode) {
return baseMapper.selAcCountBySourceBillSidAndSkuCode(sourceBillSid,goodsSkuCode);
}
}

Loading…
Cancel
Save