优化

snowy-admin-web/src/views/biz/bizchargestationreservation/form.vue

@@ -1,6 +1,6 @@
 <template>
 	<xn-form-container
-		:title="formData.id ? '编辑其他预约' : '增加其他预约'"
+		:title="formData.id ? '编辑充电预约' : '增加充电预约'"
 		:width="700"
 		v-model:open="open"
 		:destroy-on-close="true"

snowy-admin-web/src/views/biz/bizorder/dispatchadd.vue

@@ -128,7 +128,7 @@
 		})
 
 		//装货点位查询
-		bizLoadPointApi.getList().then((res)=>{
+		bizLoadPointApi.getList({'appointType':'2'}).then((res)=>{
 			loadPointIdList.value = res.map((item)=>{
 				return{
 					value:item.id,

snowy-admin-web/src/views/biz/bizotherappoint/index.vue

@@ -140,11 +140,11 @@
 									|| record.status=='8' || record.status=='9' || record.status=='16' || record.status=='17'  )">
 										<a style="color:green"  @click="cancel(record)" >强制结束</a>
 									</a-menu-item>
-									<a-menu-item v-if="hasPerm('bizOtherAppointmentAuthorize') && (record.status=='17' )">
+									<a-menu-item v-if="hasPerm('bizOtherAppointmentAuthorize') && (record.status=='5' )">
 										<a style="color:orange"  @click="exit(record)" >授权离场</a>
 									</a-menu-item>
 
-									<a-menu-item v-if="hasPerm('bizOtherComplete') && ((record.isWeigh == '2' && record.status=='5') || (record.isWeigh == '1' && record.status=='6'))">
+									<a-menu-item v-if="hasPerm('bizOtherComplete') && (record.isWeigh == '1' && record.status=='6')">
 										<a style="color:orange"  @click="completeOther(record)" >完成装货</a>
 									</a-menu-item>
 
@@ -260,12 +260,12 @@
 			align: 'center',
 			width:130
 		},
-		{
+		/*{
 			title: '备注',
 			dataIndex: 'remark',
 			align: 'center',
 			width:130
-		},
+		},*/
 	]
 	// 操作栏通过权限判断是否显示
 	columns.push({

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/record/entity/BizRecord.java

@@ -248,4 +248,8 @@ public class BizRecord extends CommonEntity {
     /**服务客户名称*/
     @TableField(exist = false)
     private String serviceCustomerName;
+
+    /**预约类型*/
+    @TableField(exist = false)
+    private String appointmentType;
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/record/mapper/mapping/BizRecordMapper.xml

@@ -325,7 +325,8 @@
             bar.status,
             bs.supplier_name,
             bla.load_number,
-            bsc.name serviceCustomerName
+            bsc.name serviceCustomerName,
+            bar.appointment_type
         from biz_record br
          left join biz_appointment_record bar on bar.id = br.appointment_id
          left join biz_order bo on bo.id = br.order_id