diff --git a/ant-design-vue-jeecg/src/mixins/JeecgListMixin.js b/ant-design-vue-jeecg/src/mixins/JeecgListMixin.js
index 51782da..2d01e81 100644
--- a/ant-design-vue-jeecg/src/mixins/JeecgListMixin.js
+++ b/ant-design-vue-jeecg/src/mixins/JeecgListMixin.js
@@ -13,7 +13,7 @@ import QRCode from 'qrcode';
export const JeecgListMixin = {
data(){
return {
- qrCodeUrl: 'http://123.57.206.181:9000/',
+ qrCodeUrl: 'http://192.168.1.73:9002/',
qrCodeForm: 'takePhoneForm',
qrCodeValue: 'http://192.168.158.19:3000/takePhoneForm', // 这里填写你想要生成二维码的内容
qrCodeImage: null, // 用于存储二维码图像数据
diff --git a/ant-design-vue-jeecg/src/views/tms/carinout/deliveryplan/DeliveryPlanList.vue b/ant-design-vue-jeecg/src/views/tms/carinout/deliveryplan/DeliveryPlanList.vue
index 1dd79a9..7230af2 100644
--- a/ant-design-vue-jeecg/src/views/tms/carinout/deliveryplan/DeliveryPlanList.vue
+++ b/ant-design-vue-jeecg/src/views/tms/carinout/deliveryplan/DeliveryPlanList.vue
@@ -50,12 +50,12 @@
-
+
@@ -110,11 +110,11 @@
详情
-
+
车辆预约
diff --git a/ant-design-vue-jeecg/src/views/tms/carinout/deliveryplan/modules/DeliveryPlanForm.vue b/ant-design-vue-jeecg/src/views/tms/carinout/deliveryplan/modules/DeliveryPlanForm.vue
index ae7d888..a4107c9 100644
--- a/ant-design-vue-jeecg/src/views/tms/carinout/deliveryplan/modules/DeliveryPlanForm.vue
+++ b/ant-design-vue-jeecg/src/views/tms/carinout/deliveryplan/modules/DeliveryPlanForm.vue
@@ -95,7 +95,7 @@
-
+ |
{{ item.po }} |
{{ item.pn }} |
|
diff --git a/ant-design-vue-jeecg/src/views/tms/carinout/vehicleinout/VehicleInOutCheckList.vue b/ant-design-vue-jeecg/src/views/tms/carinout/vehicleinout/VehicleInOutCheckList.vue
new file mode 100644
index 0000000..160e58d
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/tms/carinout/vehicleinout/VehicleInOutCheckList.vue
@@ -0,0 +1,109 @@
+
+
+
+
+
+
+
+
+
+
+ 无图片
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/tms/carinout/vehicleinout/VehicleInOutList.vue b/ant-design-vue-jeecg/src/views/tms/carinout/vehicleinout/VehicleInOutList.vue
index 91ce931..ac96d13 100644
--- a/ant-design-vue-jeecg/src/views/tms/carinout/vehicleinout/VehicleInOutList.vue
+++ b/ant-design-vue-jeecg/src/views/tms/carinout/vehicleinout/VehicleInOutList.vue
@@ -71,12 +71,12 @@
-
+
@@ -98,6 +98,7 @@
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
class="j-table-force-nowrap"
+ :customRow="rowClick"
@change="handleTableChange">
@@ -130,21 +131,27 @@
详情
-
+
handleConfirm(record.id, '2')">
入厂审核
+
+ 装车审核
+
handleConfirm(record.id, '4')">
出厂审核
+
+ 对账
+
@@ -153,6 +160,11 @@
+
+
+
+
+
@@ -163,12 +175,18 @@
import { postAction } from '@/api/manage'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import VehicleInOutModal from './modules/VehicleInOutModal'
+ import CheekModal from './modules/CheekModal.vue'
+ import VehicleInOutCheckList from './VehicleInOutCheckList.vue'
+ import CarModal from './modules/CarModal.vue'
export default {
name: 'VehicleInOutList',
mixins:[JeecgListMixin, mixinDevice],
components: {
- VehicleInOutModal
+ VehicleInOutModal,
+ CheekModal,
+ VehicleInOutCheckList,
+ CarModal
},
data () {
return {
@@ -327,6 +345,25 @@
}
})
},
+ handleCheek(record){
+ this.$refs.cheekModal.edit(record);
+ this.$refs.cheekModal.title = "对账";
+ this.$refs.cheekModal.disableSubmit = false;
+ },
+ handleCar(record){
+ this.$refs.carModal.edit(record);
+ this.$refs.carModal.title = "装车审核";
+ this.$refs.carModal.disableSubmit = false;
+ },
+ rowClick(record){
+ return {
+ on: {
+ click:() => {
+ this.$refs.vehicleInOutCheckList.getByVehicleInOutId(record.id);
+ },
+ }
+ }
+ },
initDictConfig(){
},
getSuperFieldList(){
diff --git a/ant-design-vue-jeecg/src/views/tms/carinout/vehicleinout/modules/CarForm.vue b/ant-design-vue-jeecg/src/views/tms/carinout/vehicleinout/modules/CarForm.vue
new file mode 100644
index 0000000..11470bc
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/tms/carinout/vehicleinout/modules/CarForm.vue
@@ -0,0 +1,159 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item}}
+
+
+
+
+
+
+
+
+
+ 选项 |
+ 发货单 |
+
+
+
+
+ |
+ {{ item.invoice }} |
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/tms/carinout/vehicleinout/modules/CarModal.vue b/ant-design-vue-jeecg/src/views/tms/carinout/vehicleinout/modules/CarModal.vue
new file mode 100644
index 0000000..3b9700e
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/tms/carinout/vehicleinout/modules/CarModal.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/tms/carinout/vehicleinout/modules/CheekForm.vue b/ant-design-vue-jeecg/src/views/tms/carinout/vehicleinout/modules/CheekForm.vue
new file mode 100644
index 0000000..376a176
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/tms/carinout/vehicleinout/modules/CheekForm.vue
@@ -0,0 +1,142 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ 费用类型 |
+ 价格 |
+ 上传发票 |
+
+
+
+
+ |
+
+
+ |
+ |
+
+
+
+
+ |
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/tms/carinout/vehicleinout/modules/CheekModal.vue b/ant-design-vue-jeecg/src/views/tms/carinout/vehicleinout/modules/CheekModal.vue
new file mode 100644
index 0000000..5547876
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/tms/carinout/vehicleinout/modules/CheekModal.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/tms/carinout/vehicleinoutdetail/VehicleInOutDetailList.vue b/ant-design-vue-jeecg/src/views/tms/carinout/vehicleinoutdetail/VehicleInOutDetailList.vue
index d24cd6c..2778b4d 100644
--- a/ant-design-vue-jeecg/src/views/tms/carinout/vehicleinoutdetail/VehicleInOutDetailList.vue
+++ b/ant-design-vue-jeecg/src/views/tms/carinout/vehicleinoutdetail/VehicleInOutDetailList.vue
@@ -115,7 +115,6 @@
return;
}
this.model.deliveryDetailList = this.deliveryDetailList
- console.log(this.model)
postAction(this.url.confirm, this.model).then(res => {
if(res.success){
this.$message.success(res.message);
diff --git a/ant-design-vue-jeecg/src/views/tms/outbound/deliverydemand/modules/DeliveryDemandForm.vue b/ant-design-vue-jeecg/src/views/tms/outbound/deliverydemand/modules/DeliveryDemandForm.vue
index 05aed95..5c6aaaa 100644
--- a/ant-design-vue-jeecg/src/views/tms/outbound/deliverydemand/modules/DeliveryDemandForm.vue
+++ b/ant-design-vue-jeecg/src/views/tms/outbound/deliverydemand/modules/DeliveryDemandForm.vue
@@ -98,7 +98,7 @@
-
+ |
{{ item.invoice }} |
{{ item.pickUpHub }} |
{{ item.pn }} |
diff --git a/ant-design-vue-jeecg/src/views/tms/outbound/vehicledemand/VehicleDemandList.vue b/ant-design-vue-jeecg/src/views/tms/outbound/vehicledemand/VehicleDemandList.vue
index 2e26611..78d9503 100644
--- a/ant-design-vue-jeecg/src/views/tms/outbound/vehicledemand/VehicleDemandList.vue
+++ b/ant-design-vue-jeecg/src/views/tms/outbound/vehicledemand/VehicleDemandList.vue
@@ -127,11 +127,11 @@
详情
-
+