diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyQuery.java
index 9920a67389..2affb82760 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyQuery.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyQuery.java
@@ -31,4 +31,10 @@ public class BusVehicleApplyQuery implements Query {
     private String modelName;
     @ApiModelProperty(value = "用户sid")
     private String userSid;
+
+    @ApiModelProperty("采购类型")
+    private String applyTypeKey;
+
+    @ApiModelProperty("采购原因")
+    private String schedulingTypeKey;
 }
diff --git a/anrui-base/anrui-base-biz/pom.xml b/anrui-base/anrui-base-biz/pom.xml
index 27fbe6d277..009c6630ae 100644
--- a/anrui-base/anrui-base-biz/pom.xml
+++ b/anrui-base/anrui-base-biz/pom.xml
@@ -8,6 +8,7 @@
         <version>0.0.1</version>
         <relativePath/>
     </parent>
+
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>anrui-base-biz</artifactId>
@@ -15,6 +16,11 @@
     <version>0.0.1</version>
 
     <dependencies>
+        <dependency>
+            <groupId>com.yxt.messagecenter</groupId>
+            <artifactId>message-center-api</artifactId>
+            <version>0.0.1</version>
+        </dependency>
         <dependency>
             <groupId>com.yxt</groupId>
             <artifactId>yxt-common-base</artifactId>
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/BaseApplication.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/BaseApplication.java
index ee3c30fe90..24218ee78d 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/BaseApplication.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/BaseApplication.java
@@ -12,7 +12,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
         "com.yxt.common.base.config",
         "com.yxt.anrui.base"
 })
-@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.buscenter", "com.yxt.anrui.riskcenter", "com.yxt.anrui.scm","com.yxt.anrui.crm","com.yxt.anrui.flowable","com.yxt.anrui.fin"})
+@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.buscenter", "com.yxt.anrui.riskcenter", "com.yxt.anrui.scm","com.yxt.anrui.crm","com.yxt.anrui.flowable","com.yxt.anrui.fin","com.yxt.messagecenter"})
 public class BaseApplication {
 
     public static void main(String[] args) {
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java
index 6269cbe910..88419365ac 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java
@@ -213,6 +213,9 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService<BaseMa
         if (baseManufactorSubscription == null) {
             return rb.setMsg("该数据不存在");
         }
+        if (baseManufactorSubscription.getState() == 1) {
+            return rb.setMsg("该数据已认款,请勿重复操作");
+        }
         String witMatUrl = baseManufactorSubscription.getWitMatUrl();
         if (StringUtils.isBlank(witMatUrl)) {
             return rb.setMsg("请优先上传见证材料");
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
index aa09636c6a..507412fda9 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
@@ -41,17 +41,28 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.portal.api.sysuser.UserQuery;
 import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.JPushServer;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.messagecenter.api.message.AppMessageDto;
+import com.yxt.messagecenter.api.message.MessageFeign;
+import com.yxt.messagecenter.api.messagelist.MessageListDto;
+import com.yxt.messagecenter.api.messagelist.MessageListFeign;
+import com.yxt.messagecenter.api.messagetype.MessageTypeFeign;
+import com.yxt.messagecenter.api.messagetype.MessageTypeVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 import java.util.stream.Collectors;
 
 /**
@@ -94,6 +105,13 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
     @Autowired
     private BusVehicleApplySzService busVehicleApplySzService;
 
+    @Autowired
+    private MessageTypeFeign messageTypeFeign;
+    @Autowired
+    private MessageFeign messageFeign;
+    @Autowired
+    private MessageListFeign messageListFeign;
+
     /**
      * 分页列表
      *
@@ -116,6 +134,13 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             if (StringUtils.isNotBlank(query.getUserSid())) {
                 qw.eq("bva.createBySid", query.getUserSid());
             }
+            if (StringUtils.isNotBlank(query.getApplyTypeKey())) {
+                qw.eq("bva.applyTypeKey", query.getApplyTypeKey());
+            }
+            if (StringUtils.isNotBlank(query.getSchedulingTypeKey())) {
+                qw.eq("bva.schedulingTypeKey", query.getSchedulingTypeKey());
+            }
+
             //查询分公司sid
 //            if (StringUtils.isNotBlank(query.getUserSid())) {
 //                String orgSid = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid()).getData();
@@ -330,10 +355,10 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         BusinessVariables bv = new BusinessVariables();
         //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
         Map<String, Object> variables = new HashMap<>();
-        Map<String,Object> appMap = new HashMap<>();
-        appMap.put("sid",businessSid);
+        Map<String, Object> appMap = new HashMap<>();
+        appMap.put("sid", businessSid);
         variables.put("money", Integer.valueOf(dto.getCurrentAmount()).intValue() > 0);
-        variables.put("app",appMap);
+        variables.put("app", appMap);
         //用户的部门全路径sid
         bv.setOrgSidPath(orgSidPath);
         //业务sid
@@ -350,6 +375,8 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             }
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
+            //极光推送信息
+//            messageJpush(ufVo.getTaskDefKey(), businessSid, orgSidPath);
             return voResultBean;
         }
         if (r == 2) {
@@ -366,6 +393,75 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         return rb;
     }
 
+    public void messageJpush(String taskDefKey, String businessSid, String orgSidPath) {
+        BusVehicleApply busVehicleApply = fetchBySid(businessSid);
+        GetNodeQuery getNodeQuery = new GetNodeQuery();
+        getNodeQuery.setTaskDefKey(taskDefKey);
+        getNodeQuery.setBusinessSid(businessSid);
+        ResultBean<List<GetNodeVo>> nodeVoList = getNextNodesForSubmit(getNodeQuery);
+        //根据组织架构、角色两个参数取相关符合条件的用户信息
+        UserQuery userQuery = new UserQuery();
+        userQuery.setRoleSid(nodeVoList.getData().get(0).getCandidateGroups().get(0));
+        userQuery.setOrgSidPath(orgSidPath);
+        List<SysUserVo> sysUserVos = sysUserFeign.getUserByRole(userQuery).getData();
+        StringBuilder nextNodeUserSids = new StringBuilder();
+        List<String> stringList = new ArrayList<>();
+        for (SysUserVo su : sysUserVos) {
+            stringList.add(su.getSid());
+//            nextNodeUserSids.append(su.getSid()).append(",");
+        }
+        //符合条件的用户的sid,拼接的字符串
+//        String nextNodeUserSids_ = nextNodeUserSids.toString();
+        //标题、内容、消息类别key、消息类别名称、
+        JPushServer.sendPushAlias("排产申请审批", busVehicleApply.getCreateByName() + "的排产申请", "msg_type", "系统消息", stringList.toArray(new String[stringList.size()]));
+    }
+
+    public String getMessage(List<String> list) {
+        // 1、保存消息体
+        AppMessageDto messageDto = new AppMessageDto();
+        ResultBean<List<MessageTypeVo>> messageBean = messageTypeFeign.selectAppMsgTypeList("0002");
+        if (messageBean.getSuccess() && messageBean.getData() != null) {
+            List<MessageTypeVo> typeVoList = messageBean.getData();
+            for (MessageTypeVo message : typeVoList) {
+                if (message.getMsgType().equals("系统消息")) {
+                    messageDto.setMsgTypeSid(message.getMsgTypeSid());
+                    messageDto.setMsgType(message.getMsgType());
+                }
+            }
+        }
+        messageDto.setMsgTitle("排产申请审批");
+        messageDto.setMsgContent("排产申请审批");
+        messageDto.setMsgSource("排产");
+        String msgSid = messageFeign.saveOrUpdateAppMessage(messageDto).getData();
+        String msgTypeSid = messageDto.getMsgTypeSid();
+        // 2、保存至消息列表
+        // 使用多线程保存
+        List<Future<?>> futures = new ArrayList<Future<?>>();
+        ExecutorService executor = Executors.newFixedThreadPool(4);
+        for (String receverSid : list) {
+            Future<?> f = executor.submit(new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                        System.out.println("run start-----------------" + System.currentTimeMillis() + ":" + Thread.currentThread().getName());
+                        MessageListDto messageList = new MessageListDto();
+                        messageList.setMsgSid(msgSid);
+                        messageList.setRDelStatus(0);
+                        messageList.setSDelStatus(0);
+                        messageList.setReceiverSid(receverSid);
+                        messageListFeign.save(messageList);
+                        System.out.println("run end-----------------" + System.currentTimeMillis() + ":" + Thread.currentThread().getName());
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            });
+            futures.add(f);
+        }
+        executor.shutdown();
+        return msgSid;
+    }
+
     /**
      * 判断提交的流程是否被允许
      *
@@ -459,8 +555,8 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
                     finPaymentrecordDto.setCreateOrgSid(stringResultBean.getData());
                     finPaymentrecordDto.setUseOrgSid(stringResultBean.getData());
                     finPaymentrecordDto.setCost(busVehicleApply.getCurrentAmount().intValue());
-                    finPaymentrecordDto.setCostTitleKey("1");
-                    finPaymentrecordDto.setCostTitleValue("车款");
+                    finPaymentrecordDto.setCostTitleKey("2");
+                    finPaymentrecordDto.setCostTitleValue("订金");
                     finPaymentrecordDto.setCostTypeKey("2");
                     finPaymentrecordDto.setCostTypeValue("排产");
                     //查询收款单位和收款账号
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/api/flow/orderSalesTodo.js b/anrui-buscenter/anrui-buscenter-ui/src/api/flow/orderSalesTodo.js
index 27e7428dcb..b2803ddb73 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/api/flow/orderSalesTodo.js
+++ b/anrui-buscenter/anrui-buscenter-ui/src/api/flow/orderSalesTodo.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 销售订单代办任务同意办理
+// 销售订单代办任务同意办理 (8.9修改后)
 export function businessAgree(params) {
   return request({
     url: "/buscenter/v1/bussalesorder/complete",
@@ -47,3 +47,20 @@ export function revokeTask(params) {
     }
   })
 }
+
+// 销售订单审批流程（同意）获取下一环节 (8.9修改后)
+export function getNextNodesForSubmit(params) {
+  return request({
+    url: '/buscenter/v1/bussalesorder/getNextNodesForSubmit',
+    method: 'get',
+    params: params
+  })
+}
+// 审批流程（驳回、终止）获取上一环节(8.9修改后)
+export function getPreviousNodesForReject(params) {
+  return request({
+    url: '/buscenter/v1/bussalesorder/getPreviousNodesForReject',
+    method: 'get',
+    params: params
+  })
+}
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/api/salesManagement/orderManagement.js b/anrui-buscenter/anrui-buscenter-ui/src/api/salesManagement/orderManagement.js
index 9befda46dd..39e656a779 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/api/salesManagement/orderManagement.js
+++ b/anrui-buscenter/anrui-buscenter-ui/src/api/salesManagement/orderManagement.js
@@ -36,7 +36,7 @@ export function saveOrderForm(data) {
   });
 }
 
-// 编辑、详情初始化 已改
+// 编辑、详情初始化 已改(8.9修改后)
 export function fetchDetailsBySid(params) {
   return request({
     url: "/buscenter/v1/bussalesorder/fetchDetailsBySid/" + params.sid,
@@ -44,7 +44,7 @@ export function fetchDetailsBySid(params) {
     params: params,
   });
 }
-// 销售订单提交接口
+// 销售订单提交接口 (8.9修改后)
 export function submitOrderForm(params) {
   return request({
     url: "/buscenter/v1/bussalesorder/submit",
diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java
index ab75a1dd0d..6e32aac329 100644
--- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java
@@ -271,9 +271,9 @@ public class FlowableRest implements FlowableFeign {
             return rb.setMsg("任务不存在");
         }
         String assignee = task.getAssignee();
-        if(StringUtils.isNotBlank(assignee)&& assignee.indexOf(userSid)<0){
+       /* if(StringUtils.isNotBlank(assignee)&& assignee.indexOf(userSid)<0){
             return rb.setMsg("当前用户不是环节的待办人，不能进行办理操作!");
-        }
+        }*/
         String nodeState = "";
         String taskDefKey = "";
         vo.setSid(businessSid);
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
index fbf5c23114..0e18b41504 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
@@ -593,7 +593,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         List<ScmVehicleGressionVo> scmVehicleGressionVos = baseMapper.getlastTimeEqual(dto.getVinNo(), dto.getTargetLocationSid());
         if (scmVehicleGressionVos.size() > 0) {
             if (StringUtils.isNotBlank(scmVehicleGressionVos.get(0).getNodeState())) {
-                if (!(scmVehicleGressionVos.get(0).getNodeState().contains("已办结") || scmVehicleGressionVos.get(0).getNodeState().contains("申请"))) {
+                if (!(scmVehicleGressionVos.get(0).getNodeState().contains("已办结") || scmVehicleGressionVos.get(0).getNodeState().contains("终止") || scmVehicleGressionVos.get(0).getNodeState().contains("申请"))) {
                     return rb.setMsg("该申请已存在，请务重复提交！");
                 }
             }
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue
index e990e2df88..693dbf6f7b 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue
@@ -222,6 +222,13 @@ export default {
     return {
       btndisabled: false,
       btnList: [
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'plus',
+          btnKey: 'toQuickAdd',
+          btnLabel: '快速新增'
+        },
         {
           type: 'primary',
           size: 'small',
@@ -345,6 +352,9 @@ export default {
     btnHandle(btnKey) {
       console.log('XXXXXXXXXXXXXXX    ' + btnKey)
       switch (btnKey) {
+        case 'toQuickAdd':
+          this.toQuickAdd()
+          break
         case 'toAdd':
           this.toAdd()
           break
@@ -558,6 +568,29 @@ export default {
       this.sids = aa
       console.log('sids', this.sids)
     },
+    // 打开快速添加
+    toQuickAdd() {
+      if (this.sids.length === 1) {
+        this.viewState = 2
+        const sid = this.sids[0]
+        this.$refs['divadd'].showQuickAdd(sid)
+      } else if (this.sids.length > 1) {
+        this.$notify({
+          title: '提示',
+          message: '不能选中多个车型进行快速新增操作!',
+          type: 'info',
+          duration: 2000
+        })
+      } else {
+        this.$notify({
+          title: '提示',
+          message: '没有选择车型进行快速新增操作!',
+          type: 'error',
+          duration: 2000
+        })
+        return
+      }
+    },
     // 打开添加
     toAdd() {
       this.viewState = 2
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexingAdd.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexingAdd.vue
index a0541762bf..5d6557d444 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexingAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexingAdd.vue
@@ -191,8 +191,7 @@ import {
   SaveList,
   selectByOrgSid
 } from '@/api/cheliang/basevehiclemodel'
-import {fetchBySid} from '@/api/cheliang/dictcommons'
-import { typeValues } from '@/api/cheliang/dictcommons'
+import { fetchBySid, typeValues } from '@/api/cheliang/dictcommons'
 import Upload from '@/components/uploadFile/uploadImg.vue'
 
 export default {
@@ -353,7 +352,41 @@ export default {
         this.setDetaList()
         this.getChang()
       },
-
+      showQuickAdd(sid) {
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+        this.dialogStatus = 'add'
+        this.stateId = 0
+        this.viewTitle = '【新增】常用配置信息'
+        // 此时数据必须修改才能保存
+        const userSid = window.sessionStorage.getItem('userSid')
+        getAll({ sid: sid, userSid: userSid }).then(resp => {
+          if (resp.success) {
+            const data = resp.data
+            this.temp = data
+            this.temp = JSON.parse(JSON.stringify(this.temp).replace(
+                /baseVehicleModelAppendixVos/g,
+                'baseVehicleModelAppendixDtos'
+              )
+            )
+            this.temp.sid = ''
+            if (this.temp.baseVehicleModelAppendixDtos.length > 0) {
+              for (var i = 0; i < this.temp.baseVehicleModelAppendixDtos.length; i++) {
+                var imgName = this.temp.baseVehicleModelAppendixDtos[i].filePath.split('/')
+                this.imgList.push({
+                  name: imgName[imgName.length - 1],
+                  url: this.temp.baseVehicleModelAppendixDtos[i].filePath
+                })
+              }
+              console.log('123123', this.imgList)
+            }
+          }
+        })
+        this.getPathSid()
+        this.setDetaList()
+        this.getChang()
+      },
       showEdit(sid, row) {
         console.log(sid)
         console.log('imgList', this.imgList)
@@ -426,13 +459,15 @@ export default {
       },
       getUrl() {
         console.log('已有图片', this.imgList)
+        var img_file = []
         for (var i = 0; i < this.imgList.length; i++) {
           console.log(this.temp)
-          this.temp.baseVehicleModelAppendixDtos.push({
+          img_file.push({
             modelSid: this.temp.sid,
             filePath: this.imgList[i].url
           })
         }
+        this.temp.baseVehicleModelAppendixDtos = img_file
       },
       updateUrl() {
         console.log('回显', this.imgList)
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexinglook.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexinglook.vue
index 209bb61772..c5af5c683e 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexinglook.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexinglook.vue
@@ -165,7 +165,12 @@
                   <span>{{ props.row.specification }}</span>
                 </template>
               </el-table-column>
-              <el-table-column prop="netReceiptsNum" width="150" label="后桥速比" align="center">
+              <el-table-column prop="netReceiptsNum" width="150" label="后桥" align="center">
+                <template slot-scope="props">
+                  <span>{{ props.row.rearAxleValue }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="netReceiptsNum" width="150" label="速比" align="center">
                 <template slot-scope="props">
                   <span>{{ props.row.rearAxleRatio }}</span>
                 </template>
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/changyongpeizhi.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/changyongpeizhi.vue
index f5f2c92a92..ce20bd58c3 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/changyongpeizhi.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/changyongpeizhi.vue
@@ -166,7 +166,12 @@
                 <span>{{ scope.row.specification }}</span>
               </template>
             </el-table-column>
-            <el-table-column width="110px" label="后桥速比" align="center">
+            <el-table-column width="110px" label="后桥" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.rearAxleValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column width="110px" label="速比" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.rearAxleRatio }}</span>
               </template>
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue
index 824eb60044..08d06163c1 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue
@@ -170,7 +170,12 @@
                 <span>{{ scope.row.specification }}</span>
               </template>
             </el-table-column>
-            <el-table-column width="110px" label="后桥速比" align="center">
+            <el-table-column width="110px" label="后桥" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.rearAxleValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column width="110px" label="速比" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.rearAxleRatio }}</span>
               </template>
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhi.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhi.vue
index 49140e223c..8e3fcd6d92 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhi.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhi.vue
@@ -183,7 +183,12 @@
               <span>{{ scope.row.specification }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="后桥速比" width="130px" align="center">
+          <el-table-column label="后桥" width="130px" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.rearAxleValue }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="速比" width="130px" align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.rearAxleRatio }}</span>
             </template>
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue
index 71de0afe9e..5c721235d6 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue
@@ -8,7 +8,7 @@
           <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-form-item label="认款状态">
                 <el-select v-model="listQuery.params.state" placeholder="请选择" clearable class="addinputw">
                   <el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
                 </el-select>
@@ -18,7 +18,7 @@
                   <el-option v-for="item in paymentState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
                 </el-select>
               </el-form-item>
-              <el-form-item label="认款时间">
+              <el-form-item label="认款日期">
                 <div class="block" style="float: left;">
                   <el-date-picker v-model="listQuery.params.subscriptionStartDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
                 </div>
@@ -27,9 +27,14 @@
                   <el-date-picker v-model="listQuery.params.subscriptionEndDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
                 </div>
               </el-form-item>
-              <el-form-item label="排产申请编号">
+              <el-form-item label="申请编号">
                 <el-input v-model="listQuery.params.proSchAppNo" placeholder="请输入排产申请编号" clearable/>
               </el-form-item>
+              <el-form-item label="采购类型">
+                <el-select v-model="listQuery.params.applyTypeKey" placeholder="请选择" clearable class="addinputw">
+                  <el-option v-for="item in applyType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </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>
@@ -54,11 +59,16 @@
                 <span>{{ scope.row.state == '0' ? '未认款' : '已认款' }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="排产申请编号" align="center" width="200px">
+            <el-table-column label="申请编号" align="center" width="200px">
               <template slot-scope="scope">
                 <span>{{ scope.row.proSchAppNo }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="采购类型" align="center" width="200px">
+              <template slot-scope="scope">
+                <span>{{ scope.row.applyType }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="申请订金金额" header-align="center" align="left" width="150px">
               <template slot-scope="scope">
                 <span>{{ scope.row.paymentMoney }}</span>
@@ -110,7 +120,7 @@
 
 <script>
 import req from '@/api/supplychain/manufacturers'
-import { getPathSidByUserSid } from '@/api/cheliang/dictcommons'
+import { getPathSidByUserSid, typeValues } from '@/api/cheliang/dictcommons'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
@@ -168,6 +178,7 @@ export default {
           dictValue: '无需打款'
         }
       ],
+      applyType_list: [],
       FormLoading: false,
       listLoading: false,
       listQuery: {
@@ -177,6 +188,7 @@ export default {
           subscriptionStartDate: '',
           subscriptionEndDate: '',
           proSchAppNo: '',
+          applyTypeKey: '',
           createOrgSid: ''
         },
         current: 1,
@@ -217,6 +229,11 @@ export default {
       }
     },
     init() {
+      typeValues({ type: 'applyType' }).then((resp) => {
+        if (resp.success) {
+          this.applyType_list = resp.data
+        }
+      })
       getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
         if (res.success) {
           this.listQuery.params.createOrgSid = res.data
@@ -263,6 +280,7 @@ export default {
           subscriptionStartDate: '',
           subscriptionEndDate: '',
           proSchAppNo: '',
+          applyTypeKey: '',
           createOrgSid: ''
         },
         current: 1,
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichan.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichan.vue
index 05432b88c8..2ab0b63a94 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichan.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichan.vue
@@ -13,8 +13,15 @@
                 <div class="line">至</div>
                 <el-date-picker value-format="yyyy-MM-dd" v-model="queryParams.params.applicationDateEnd" clearable style="width: 160px;" type="date" placeholder="结束日期"/>
               </el-form-item>
-              <el-form-item label="车型">
-                <el-input v-model="queryParams.params.modelName" placeholder="请输入车型" clearable/>
+              <el-form-item label="采购类型">
+                <el-select v-model="queryParams.params.applyTypeKey" placeholder="请选择" clearable filterable>
+                  <el-option v-for="item in applyType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="采购原因">
+                <el-select v-model="queryParams.params.schedulingTypeKey" placeholder="请选择" clearable filterable>
+                  <el-option v-for="item in schedulingType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
+                </el-select>
               </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
@@ -44,7 +51,7 @@
                 <span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
               </template>
             </el-table-column>
-            <el-table-column width="150" prop="schedulingType" label="排产类型" align="center"/>
+            <el-table-column width="150" prop="schedulingType" label="采购原因" align="center"/>
             <el-table-column width="200" prop="applicationCode" label="申请编号" align="center"/>
             <el-table-column width="150" prop="applicationDate" label="申请日期" align="center"/>
             <el-table-column width="150" prop="createOrgName" label="分公司" align="center"/>
@@ -127,6 +134,8 @@ export default {
       // sid数组
       sids: [], // 用于导出的时候保存已选择SID
       sides: '', // 一条数据的sid
+      schedulingType_list: [],
+      applyType_list: [],
       queryParams: {
         current: 1,
         size: 10,
@@ -134,7 +143,8 @@ export default {
         params: {
           applicationDateStart: '',
           applicationDateEnd: '',
-          modelName: '', // 车型
+          applyTypeKey: '',
+          schedulingTypeKey: '',
           userSid: ''
         }
       },
@@ -142,6 +152,7 @@ export default {
     }
   },
   created() {
+    this.init()
     this.loadList()
   },
   mounted() {
@@ -179,6 +190,20 @@ export default {
       }
       this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
     },
+    init() {
+      req.pullDown({ type: 'schedulingType' }).then((res) => {
+        if (res.success) {
+          this.schedulingType_list = res.data
+          console.log('下拉框请求111', res.data)
+        }
+      })
+      req.pullDown({ type: 'applyType' }).then((res) => {
+        if (res.success) {
+          this.applyType_list = res.data
+          console.log('下拉框请求111', res.data)
+        }
+      })
+    },
     btnHandle(btnKey) {
       console.log('XXXXXXXXXXXXXXX' + btnKey)
       switch (btnKey) {
@@ -234,7 +259,8 @@ export default {
           params: {
           applicationDateStart: '',
             applicationDateEnd: '',
-            modelName: '', // 车型
+            applyTypeKey: '',
+            schedulingTypeKey: '',
             userSid: ''
         }
       }
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue
index 9d1fe7011b..cb8f294888 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue
@@ -34,8 +34,16 @@
             </el-col>
           </el-row>
           <el-row class="rowStyle">
-            <el-col :span="24" class="colStyle">
-              <div class="span-sty spanOneWidth"><span>排产类型:</span></div>
+            <el-col :span="8" class="colStyle">
+              <div class="span-sty spanOneWidth"><span>采购类型:</span></div>
+              <el-form-item>
+                <el-select v-model="formobj.applyType" placeholder="请选择" @change="changeApplyType" clearable class="addinputInfo addinputOne">
+                  <el-option v-for="item in applyType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="16" class="colStyle">
+              <div class="span-sty spanOneWidth"><span>采购原因:</span></div>
               <el-form-item>
                 <el-select v-model="formobj.schedulingType" placeholder="请选择" @change="changeSchedulingType" clearable class="addinputInfo addinputOne">
                   <el-option v-for="item in schedulingType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
@@ -150,6 +158,7 @@ export default {
       tableKey: 0,
       // 下拉框
       schedulingType_list: [], // 排产订金使用
+      applyType_list: [],
       isRead: false,
       // 表单数据
       formobj: {
@@ -159,7 +168,9 @@ export default {
         createByName: '', // 制单人
         applicationCode: '', // 申请编号
         applicationDate: '', // 申请日期
-        schedulingType: '', // 排产类型
+        applyType: '', // 采购类型
+        applyTypeKey: '',
+        schedulingType: '', // 采购原因
         schedulingTypeKey: '',
         remarks: '', // 备注
         currentAmount: '', // 当前订金金额
@@ -179,7 +190,11 @@ export default {
       req.pullDown({ type: 'schedulingType' }).then((res) => {
         if (res.success) {
           this.schedulingType_list = res.data
-          console.log('下拉框请求111', res.data)
+        }
+      })
+      req.pullDown({ type: 'applyType' }).then((res) => {
+        if (res.success) {
+          this.applyType_list = res.data
         }
       })
     },
@@ -285,6 +300,18 @@ export default {
         })
       }
     },
+    changeApplyType(value) {
+      let bb = null
+      this.applyType_list.forEach((e) => {
+        if (e.dictValue === value) {
+          bb = {
+            key: e.dictKey,
+            value: e.dictValue
+          }
+        }
+      })
+      this.formobj.applyTypeKey = bb.key
+    },
     changeSchedulingType(value) {
       let bb = null
       this.schedulingType_list.forEach((e) => {
@@ -408,6 +435,8 @@ export default {
     // 返回（===既判断）
     handleReturn(isreload) {
       if (isreload === 'true') this.$emit('reloadlist')
+      this.formobj.applyType = ''
+      this.formobj.applyTypeKey = ''
       this.formobj.schedulingType = '' // 排产类型
       this.formobj.schedulingTypeKey = ''
       this.formobj.remarks = '' // 备注
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue
index f3be1e0de8..2d519f47f9 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue
@@ -30,8 +30,13 @@
             </el-col>
           </el-row>
           <el-row class="rowStyle">
-            <el-col :span="24" class="colStyle">
-              <div class="span-sty spanOneWidth"><span>排产类型:</span></div>
+            <el-col :span="8" class="colStyle">
+              <div class="span-sty spanOneWidth"><span>采购类型:</span></div>
+              <el-form-item><span class="addinputInfo addinputOne">{{ formobj.applyType }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="16" class="colStyle">
+              <div class="span-sty spanOneWidth"><span>采购原因:</span></div>
               <el-form-item><span class="addinputInfo addinputOne">{{ formobj.schedulingType }}</span>
               </el-form-item>
             </el-col>
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanli.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanli.vue
index 6352d59481..02a6b66f85 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanli.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanli.vue
@@ -29,6 +29,13 @@
                 </el-select>
                 <!--    <el-input v-model="listQuery.params.warehouseContract" placeholder="请输入负责人" clearable/>-->
               </el-form-item>
+              <el-form-item label="验车日期">
+                <el-date-picker v-model="listQuery.params.inspectedStartDate" class="filter-item" type="date"
+                                format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="请选择"/>
+                <label>至</label>
+                <el-date-picker v-model="listQuery.params.inspectedEndDate" class="filter-item" type="date"
+                                format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="请选择"/>
+              </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
               <el-button type="primary" icon="el-icon-search" size="small" @click="getList">查询</el-button>
@@ -126,6 +133,8 @@ export default {
           vin: '',
           model: '',
           purchaseType: '',
+          inspectedStartDate:'',
+          inspectedEndDate:'',
           userSid: window.sessionStorage.getItem('userSid')
         }
       },
@@ -187,6 +196,8 @@ export default {
           vin: '',
           model: '',
           purchaseType: '',
+          inspectedStartDate:'',
+          inspectedEndDate:'',
           userSid: window.sessionStorage.getItem('userSid')
         }
       }
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue
index d8509f37ce..ac5000e597 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue
@@ -32,8 +32,13 @@
             </el-col>
           </el-row>
           <el-row class="rowStyle">
-            <el-col :span="24" class="colStyle">
-              <div class="span-sty spanOneWidth"><span>排产类型:</span></div>
+            <el-col :span="8" class="colStyle">
+              <div class="span-sty spanOneWidth"><span>采购类型:</span></div>
+              <el-form-item><span class="addinputInfo addinputOne">{{ formobj.applyType }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="16" class="colStyle">
+              <div class="span-sty spanOneWidth"><span>采购原因:</span></div>
               <el-form-item><span class="addinputInfo addinputOne">{{ formobj.schedulingType }}</span>
               </el-form-item>
             </el-col>
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue
index e86fc47c94..960201d296 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue
@@ -33,8 +33,16 @@
             </el-col>
           </el-row>
           <el-row class="rowStyle">
-            <el-col :span="24" class="colStyle">
-              <div class="span-sty spanOneWidth"><span>排产类型:</span></div>
+            <el-col :span="8" class="colStyle">
+              <div class="span-sty spanOneWidth"><span>采购类型:</span></div>
+              <el-form-item>
+                <el-select v-model="formobj.applyType" placeholder="请选择" @change="changeApplyType" clearable class="addinputInfo addinputOne">
+                  <el-option v-for="item in applyType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="16" class="colStyle">
+              <div class="span-sty spanOneWidth"><span>采购原因:</span></div>
               <el-form-item>
                 <el-select v-model="formobj.schedulingType" placeholder="请选择" @change="changeSchedulingType" clearable class="addinputInfo addinputOne">
                   <el-option v-for="item in schedulingType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
@@ -148,6 +156,7 @@ export default {
       tableKey: 0,
       // 下拉框
       schedulingType_list: [], // 排产订金使用
+      applyType_list: [],
       isRead: false,
       // 表单数据
       formobj: {
@@ -157,7 +166,9 @@ export default {
         createByName: '', // 制单人
         applicationCode: '', // 申请编号
         applicationDate: '', // 申请日期
-        schedulingType: '', // 排产类型
+        applyType: '', // 采购类型
+        applyTypeKey: '',
+        schedulingType: '', // 采购原因
         schedulingTypeKey: '',
         remarks: '', // 备注
         currentAmount: '', // 当前订金金额
@@ -196,7 +207,11 @@ export default {
       req.pullDown({ type: 'schedulingType' }).then((res) => {
         if (res.success) {
           this.schedulingType_list = res.data
-          console.log('下拉框请求111', res.data)
+        }
+      })
+      req.pullDown({ type: 'applyType' }).then((res) => {
+        if (res.success) {
+          this.applyType_list = res.data
         }
       })
     },
@@ -263,6 +278,18 @@ export default {
         })
       }
     },
+    changeApplyType(value) {
+      let bb = null
+      this.applyType_list.forEach((e) => {
+        if (e.dictValue === value) {
+          bb = {
+            key: e.dictKey,
+            value: e.dictValue
+          }
+        }
+      })
+      this.formobj.applyTypeKey = bb.key
+    },
     changeSchedulingType(value) {
       let bb = null
       this.schedulingType_list.forEach((e) => {
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue
index 5be6cbfa4c..584327c768 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue
@@ -30,8 +30,13 @@
             </el-col>
           </el-row>
           <el-row class="rowStyle">
-            <el-col :span="24" class="colStyle">
-              <div class="span-sty spanOneWidth"><span>排产类型:</span></div>
+            <el-col :span="8" class="colStyle">
+              <div class="span-sty spanOneWidth"><span>采购类型:</span></div>
+              <el-form-item><span class="addinputInfo addinputOne">{{ formobj.applyType }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="16" class="colStyle">
+              <div class="span-sty spanOneWidth"><span>采购原因:</span></div>
               <el-form-item><span class="addinputInfo addinputOne">{{ formobj.schedulingType }}</span>
               </el-form-item>
             </el-col>
diff --git a/anrui-system-ui/src/views/organizationManage/organizationManage.vue b/anrui-system-ui/src/views/organizationManage/organizationManage.vue
index 982f64cfb4..a8ee76fbe0 100644
--- a/anrui-system-ui/src/views/organizationManage/organizationManage.vue
+++ b/anrui-system-ui/src/views/organizationManage/organizationManage.vue
@@ -44,7 +44,7 @@
         <tr>
           <td>主管人员</td>
           <td>
-            <el-select v-model="form.zgStaffSid" style="width:300px">
+            <el-select v-model="form.zgStaffSid" style="width:300px" clearable>
               <el-option v-for="(item, i) in staffdata" :key="i" :label="item.name" :value="item.sid">
               </el-option>
             </el-select>
@@ -52,7 +52,7 @@
 
           <td>分管人员</td>
           <td>
-            <el-select v-model="form.fgStaffSid" style="width:300px" filterable multiple>
+            <el-select v-model="fgStaffSid" style="width:300px" filterable multiple>
               <el-option v-for="(item,index) in staffdata2" :key="item.sid" :label="item.name" :value="item.sid"/>
             </el-select>
             <!--            <el-autocomplete v-model="form.fgStaffName" :fetch-suggestions="querySearchAsync" class="addinputw"-->
@@ -217,7 +217,7 @@
           <tr>
             <td>主管人员</td>
             <td>
-              <el-select v-model="form.zgStaffSid" style="width:300px" @change="zgStaffSidChange">
+              <el-select v-model="form.zgStaffSid" clearable style="width:300px" @change="zgStaffSidChange">
                 <el-option v-for="(item, i) in staffdata" :key="i" :label="item.name" :value="item.sid">
                 </el-option>
               </el-select>
@@ -225,7 +225,7 @@
 
             <td>分管人员</td>
             <td>
-              <el-select v-model="form.fgStaffSid" style="width:300px" filterable multiple>
+              <el-select v-model="fgStaffSid" style="width:300px" filterable multiple>
                 <el-option v-for="(item,index) in staffdata2" :key="item.sid" :label="item.name" :value="item.sid"/>
               </el-select>
             </td>
@@ -312,7 +312,7 @@ export default {
         sort: '',
         isDept: ''
       },
-
+      fgStaffSid: [],
       formBackup: Object.assign({}, this.form),
       isshow: 'table',
       page: {
@@ -376,7 +376,12 @@ export default {
       })
     },
     save() {
-      this.form.fgStaffSid = this.form.fgStaffSid.join()
+      if (this.fgStaffSid.length > 0) {
+        this.form.fgStaffSid = this.fgStaffSid.join()
+      } else {
+        this.form.fgStaffName = ''
+        this.form.fgStaffSid = ''
+      }
       this.form.organizationSid = this.$store.getters.userInfo.orgSid
 //      this.form.dlxx = typeof(this.form.dlxx) == 'string' ? this.form.dlxx : this.form.dlxx.join()
       if (this.form.sid) {
@@ -384,7 +389,7 @@ export default {
         putOrgtree(this.form).then(res => {
           this.isshow = 'table'
           this.getOrgTree()
-          this.handleNodeClick({ sid: this.form.psid })
+          this.handleNodeClick({sid: this.form.psid})
           this.$message({
             message: res.msg,
             type: 'success'
@@ -423,10 +428,13 @@ export default {
         if (response.success) {
           this.form = response.data
           this.form.fgStaffName = response.data.fgNames
-          this.form.fgStaffSid = response.data.fgStaffSid.split(',')
+          this.form.fgStaffSid = response.data.fgStaffSid
+          if (this.form.fgStaffSid) {
+            this.fgStaffSid = response.data.fgStaffSid.split(',')
+          }
           this.form.zgStaffName = response.data.zgNames
           this.form.zgStaffSid = response.data.zgStaffSid
-          console.log('112233445566', this.form)
+          console.log('编辑回显的数据', this.form)
         }
       })
 //       console.log('点击编辑', row)
@@ -465,6 +473,7 @@ export default {
       this.form.fgStaffSid = data.fgSids.split(',')
     },
     nodeSave() { // 节点编辑保存
+      console.log('这是保存nodeSave(0')
       this.form.fgStaffSid = this.form.fgStaffSid.join()
       postOrgtree(this.form).then(res => {
         this.getOrgTree()