Merge remote-tracking branch 'origin/master'

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.java

@@ -186,4 +186,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     List<SysUserVo> getUserMessageByRole(@Param("roleSid") String roleSid,@Param("levelOrgSid") String levelOrgSid, @Param("list") List<String> stringList);
 
     int updateAppIdNull(String appId);
+
+    String fetchByUserNameAndUserPhone(@Param("userName") String userName,@Param("userPhone") String userPhone);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml

@@ -5,59 +5,59 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.portal.api.sysuser.SysUserVo">
         SELECT DISTINCT user.staffSid,
-                        user.isEnable,
-                        (
-                            SELECT GROUP_CONCAT(org.name)
-                            FROM sys_staff_org staffOrg
-                                     LEFT JOIN sys_organization org ON org.sid = staffOrg.orgSid
-                            WHERE staffOrg.staffSid = user.staffSid
-                        )              departmentName,
-                        (
-                            SELECT GROUP_CONCAT(org.sid)
-                            FROM sys_staff_org staffOrg
-                                     LEFT JOIN sys_organization org ON org.sid = staffOrg.orgSid
-                            WHERE staffOrg.staffSid = user.staffSid
-                        )              departmentSid,
-                        (
-                            SELECT GROUP_CONCAT(post.name)
-                            FROM sys_staff_post staffPost
-                                     LEFT JOIN sys_post post ON post.sid = staffPost.postSid
-                            WHERE staffPost.staffSid = user.staffSid
-                        )              postName,
-                        (
-                            SELECT GROUP_CONCAT(post.sid)
-                            FROM sys_staff_post staffPost
-                                     LEFT JOIN sys_post post ON post.sid = staffPost.postSid
-                            WHERE staffPost.staffSid = user.staffSid
-                        )              postSid,
-                        user.userName,
-                        user.sid       sid,
-                        staff.name,
-                        (
-                            SELECT GROUP_CONCAT(role.name)
-                            FROM sys_user_role user_role
-                                     LEFT JOIN sys_role role ON role.sid = user_role.roleSid
-                            WHERE user_role.userSid = USER.sid
-                        )              roleName,
-                        dict.dictValue userType,
-                        user.userType  userTypeKey
+        user.isEnable,
+        (
+        SELECT GROUP_CONCAT(org.name)
+        FROM sys_staff_org staffOrg
+        LEFT JOIN sys_organization org ON org.sid = staffOrg.orgSid
+        WHERE staffOrg.staffSid = user.staffSid
+        ) departmentName,
+        (
+        SELECT GROUP_CONCAT(org.sid)
+        FROM sys_staff_org staffOrg
+        LEFT JOIN sys_organization org ON org.sid = staffOrg.orgSid
+        WHERE staffOrg.staffSid = user.staffSid
+        ) departmentSid,
+        (
+        SELECT GROUP_CONCAT(post.name)
+        FROM sys_staff_post staffPost
+        LEFT JOIN sys_post post ON post.sid = staffPost.postSid
+        WHERE staffPost.staffSid = user.staffSid
+        ) postName,
+        (
+        SELECT GROUP_CONCAT(post.sid)
+        FROM sys_staff_post staffPost
+        LEFT JOIN sys_post post ON post.sid = staffPost.postSid
+        WHERE staffPost.staffSid = user.staffSid
+        ) postSid,
+        user.userName,
+        user.sid sid,
+        staff.name,
+        (
+        SELECT GROUP_CONCAT(role.name)
+        FROM sys_user_role user_role
+        LEFT JOIN sys_role role ON role.sid = user_role.roleSid
+        WHERE user_role.userSid = USER.sid
+        ) roleName,
+        dict.dictValue userType,
+        user.userType userTypeKey
         FROM sys_user USER
-                 LEFT JOIN sys_user_role user_role ON user_role.userSid = USER.sid
-                 LEFT JOIN sys_role role ON role.sid = user_role.roleSid
-                 LEFT JOIN dict_common dict ON dict.dictKey = user.userType AND dict.dictType = 'userType'
-                 LEFT JOIN sys_staffinfo staff ON staff.sid = user.staffSid
+        LEFT JOIN sys_user_role user_role ON user_role.userSid = USER.sid
+        LEFT JOIN sys_role role ON role.sid = user_role.roleSid
+        LEFT JOIN dict_common dict ON dict.dictKey = user.userType AND dict.dictType = 'userType'
+        LEFT JOIN sys_staffinfo staff ON staff.sid = user.staffSid
         <where>
             ${ew.sqlSegment}
             <if test="orgName != null and orgName != ''">
                 AND (SELECT GROUP_CONCAT(org.name)
-                     FROM sys_staff_org staffOrg
-                              LEFT JOIN sys_organization org ON org.sid = staffOrg.orgSid
-                     WHERE staffOrg.staffSid = user.staffSid)
-                    LIKE concat('%',
-                    #{orgName}
-                    ,
-                    '%'
-                    )
+                FROM sys_staff_org staffOrg
+                LEFT JOIN sys_organization org ON org.sid = staffOrg.orgSid
+                WHERE staffOrg.staffSid = user.staffSid)
+                LIKE concat('%',
+                #{orgName}
+                ,
+                '%'
+                )
             </if>
             <if test="userName != null and userName != ''">
                 and
@@ -113,7 +113,7 @@
     <select id="selectByUserName" resultType="com.yxt.anrui.portal.api.sysuser.SysUser">
         SELECT su.*
         FROM sys_user su
-                 left join sys_staffinfo si on si.sid = su.staffSid
+                     left join sys_staffinfo si on si.sid = su.staffSid
         where su.userName = #{param1}
           and su.isDelete = 0
           and su.userType = 1
@@ -122,7 +122,7 @@
     <select id="selectByUserNameApp" resultType="com.yxt.anrui.portal.api.sysuser.SysUser">
         SELECT su.*
         FROM sys_user su
-                 left join sys_staffinfo si on si.sid = su.staffSid
+                     left join sys_staffinfo si on si.sid = su.staffSid
         where su.userName = #{param1}
           and su.isDelete = 0
           and su.userType = 1
@@ -190,7 +190,7 @@
     <select id="selectByStaffsid" resultType="com.yxt.anrui.portal.api.sysuser.SysUserVo">
         SELECT *
         FROM sys_user su
-                 LEFT JOIN sys_staffinfo ss ON su.staffSid = ss.sid
+                     LEFT JOIN sys_staffinfo ss ON su.staffSid = ss.sid
         WHERE su.staffSid = #{staffSid}
           AND su.isDelete = 0
     </select>
@@ -198,35 +198,32 @@
     <select id="getUserOrgInfoByUserSid" resultType="com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo">
         SELECT su.staffSid, ss.name staffName, sso.orgSid, sso.orgName, sso.orgSidPath, so.orgCode
         FROM sys_user su
-                 LEFT JOIN sys_staffinfo ss ON su.staffSid = ss.sid
-                 LEFT JOIN sys_staff_org sso ON su.staffSid = sso.staffSid
-                 LEFT JOIN sys_organization so ON sso.orgSid = so.sid
+                     LEFT JOIN sys_staffinfo ss ON su.staffSid = ss.sid
+                     LEFT JOIN sys_staff_org sso ON su.staffSid = sso.staffSid
+                     LEFT JOIN sys_organization so ON sso.orgSid = so.sid
         WHERE su.sid = #{userSid}
-        ORDER BY sso.id
-        LIMIT 1
+        ORDER BY sso.id LIMIT 1
     </select>
     <!--根据用户的sid查询用户的组织信息:多个时取第一个-->
     <select id="selectUserInfoByUserSid" resultType="com.yxt.anrui.portal.api.sysuser.SysUserInfoVo">
         SELECT su.staffSid, si.name staffName, sso.orgSid, sso.orgName, so.orgCode
         FROM sys_user su
-                 LEFT JOIN sys_staffinfo si ON su.staffSid = si.sid
-                 LEFT JOIN sys_staff_org sso ON su.staffSid = sso.staffSid
-                 LEFT JOIN sys_organization so ON sso.orgSid = so.sid
+                     LEFT JOIN sys_staffinfo si ON su.staffSid = si.sid
+                     LEFT JOIN sys_staff_org sso ON su.staffSid = sso.staffSid
+                     LEFT JOIN sys_organization so ON sso.orgSid = so.sid
         WHERE su.sid = #{userSid}
-        ORDER BY sso.id
-        LIMIT 1
+        ORDER BY sso.id LIMIT 1
     </select>
 
     <select id="selectUserInfoByUserSidOne" resultType="com.yxt.anrui.portal.api.sysuser.SysUserInfoVo">
         SELECT su.staffSid, si.name staffName, sso.orgSid, sso.orgName, so.orgCode
         FROM sys_user su
-                 LEFT JOIN sys_staffinfo si ON su.staffSid = si.sid
-                 LEFT JOIN sys_staff_org sso ON su.staffSid = sso.staffSid
-                 LEFT JOIN sys_organization so ON sso.orgSid = so.sid
+                     LEFT JOIN sys_staffinfo si ON su.staffSid = si.sid
+                     LEFT JOIN sys_staff_org sso ON su.staffSid = sso.staffSid
+                     LEFT JOIN sys_organization so ON sso.orgSid = so.sid
         WHERE su.sid = #{userSid}
           and find_in_set(#{orgSid}, replace(sso.orgSidPath, '/', ','))
-        ORDER BY sso.id
-        LIMIT 1
+        ORDER BY sso.id LIMIT 1
     </select>
     <!--根据员工sid更新用户表的工号以及手机号-->
     <update id="updateByStaffSid">
@@ -245,7 +242,7 @@
     <select id="selectByMobile" resultType="com.yxt.anrui.portal.api.sysuser.SysUser">
         select su.*
         from sys_user su
-                 left join sys_staffinfo si on si.sid = su.staffSid
+                     left join sys_staffinfo si on si.sid = su.staffSid
         where su.mobile = #{mobile}
           and su.isDelete = 0
           and su.userType = 1
@@ -261,22 +258,22 @@
     <select id="getUsersByRoleSid" resultType="com.yxt.anrui.portal.api.sysuser.SysUserVo">
         SELECT su.sid, ss.name, sso.orgNamePath departmentName
         FROM `sys_user` su
-                 LEFT JOIN `sys_staffinfo` ss ON su.staffSid = ss.sid
-                 LEFT JOIN `sys_staff_org` sso ON sso.staffSid = ss.sid
-                 LEFT JOIN `sys_user_role` sur ON sur.userSid = su.sid
-                 LEFT JOIN `sys_role` sr ON sr.sid = sur.roleSid
+                     LEFT JOIN `sys_staffinfo` ss ON su.staffSid = ss.sid
+                     LEFT JOIN `sys_staff_org` sso ON sso.staffSid = ss.sid
+                     LEFT JOIN `sys_user_role` sur ON sur.userSid = su.sid
+                     LEFT JOIN `sys_role` sr ON sr.sid = sur.roleSid
         WHERE sr.sid = #{roleSid}
     </select>
 
     <select id="getUserByRole" resultType="com.yxt.anrui.portal.api.sysuser.SysUserVo">
         select distinct si.name, su.sid, su.staffSid<!--, so.orgSidPath-->
         from sys_user_role sr
-                 left join sys_user su on sr.userSid = su.sid
-                 left join sys_staffinfo si on si.sid = su.staffSid
-                 left join sys_staff_org so on so.staffSid = si.sid
+        left join sys_user su on sr.userSid = su.sid
+        left join sys_staffinfo si on si.sid = su.staffSid
+        left join sys_staff_org so on so.staffSid = si.sid
         where sr.roleSid = #{roleSid}
-          and find_in_set(#{levelOrgSid}, replace(so.orgSidPath, '/', ','))
-          and si.personTypeKey != '01'
+        and find_in_set(#{levelOrgSid}, replace(so.orgSidPath, '/', ','))
+        and si.personTypeKey != '01'
     </select>
 
     <select id="getUserByOrgSid" resultType="java.util.Map">
@@ -285,14 +282,14 @@
                sso.orgName,
                sp.name as postName
         FROM sys_user su
-                 LEFT JOIN sys_staffinfo st
-                           ON su.`staffSid` = st.`sid`
-                 LEFT JOIN sys_staff_org sso
-                           ON st.`sid` = sso.`staffSid`
-                 LEFT JOIN sys_staff_post ssp
-                           ON st.sid = ssp.`staffSid`
-                 LEFT JOIN sys_post sp
-                           ON ssp.`postSid` = sp.`sid`
+                     LEFT JOIN sys_staffinfo st
+                ON su.`staffSid` = st.`sid`
+                     LEFT JOIN sys_staff_org sso
+                ON st.`sid` = sso.`staffSid`
+                     LEFT JOIN sys_staff_post ssp
+                ON st.sid = ssp.`staffSid`
+                     LEFT JOIN sys_post sp
+                ON ssp.`postSid` = sp.`sid`
         WHERE su.sid != #{userSid}
           AND sso.`orgSidPath` LIKE concat('%'
             , #{orgSid}
@@ -302,7 +299,7 @@
     <select id="fetchBySids" resultType="com.yxt.anrui.portal.api.sysuser.SysUserVo">
         select su.*, ss.name
         from sys_user su
-                 left join sys_staffinfo ss on su.staffSid = ss.sid
+        left join sys_staffinfo ss on su.staffSid = ss.sid
         where su.sid in
         <foreach collection="sids" index="index" item="item" open="(" separator="," close=")">
             #{item}
@@ -312,8 +309,8 @@
     <select id="getUserByRoleSid" resultType="com.yxt.anrui.portal.api.sysuser.SysUserVo">
         select si.name, su.sid, su.staffSid
         from sys_user_role sr
-                 left join sys_user su on sr.userSid = su.sid
-                 left join sys_staffinfo si on si.sid = su.staffSid
+                     left join sys_user su on sr.userSid = su.sid
+                     left join sys_staffinfo si on si.sid = su.staffSid
         where sr.roleSid = #{roleSid}
           and si.personTypeKey != '01'
     </select>
@@ -340,19 +337,31 @@
     <select id="getUserMessageByRole" resultType="com.yxt.anrui.portal.api.sysuser.SysUserVo">
         select distinct si.name, su.sid, su.staffSid,so.orgSidPath
         from sys_user_role sr
-                 left join sys_user su on sr.userSid = su.sid
-                 left join sys_staffinfo si on si.sid = su.staffSid
-                 left join sys_staff_org so on so.staffSid = si.sid
+        left join sys_user su on sr.userSid = su.sid
+        left join sys_staffinfo si on si.sid = su.staffSid
+        left join sys_staff_org so on so.staffSid = si.sid
         where sr.roleSid = #{roleSid}
-          and find_in_set(#{levelOrgSid}, replace(so.orgSidPath, '/', ','))
-          and si.personTypeKey != '01' AND so.`manageType`=3 and su.sid in
+        and find_in_set(#{levelOrgSid}, replace(so.orgSidPath, '/', ','))
+        and si.personTypeKey != '01' AND so.`manageType`=3 and su.sid in
         <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
             #{item}
         </foreach>
     </select>
 
     <update id="updateAppIdNull">
-        update sys_user set appId = NULL WHERE appId = #{appId} and isDelete = 0
-        and userType = 1
+        update sys_user
+        set appId = NULL
+        WHERE appId = #{appId}
+          and isDelete = 0
+          and userType = 1
     </update>
+
+    <select id="fetchByUserNameAndUserPhone" resultType="java.lang.String">
+        SELECT su.`sid`
+        FROM sys_user su
+                     LEFT JOIN sys_staffinfo ss
+                ON su.`staffSid` = ss.`sid`
+        WHERE ss.name = #{userName}
+          AND su.mobile = #{userPhone}
+    </select>
 </mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java

@@ -943,7 +943,15 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
 
     public ResultBean reGetPwd(String userName, String userPhone) {
         ResultBean rb = ResultBean.fireFail();
-        return null;
+        String userSid = baseMapper.fetchByUserNameAndUserPhone(userName, userPhone);
+        if (StringUtils.isNotBlank(userSid)){
+            Boolean aBoolean = initPwd(userSid);
+            if (!aBoolean) {
+                return ResultBean.fireFail().setMsg("初始化密码失败");
+            }
+            return ResultBean.fireSuccess().setMsg("初始化密码成功");
+        }
+        return rb.setMsg("姓名或手机号填写不正确");
     }
 
     public int updateIsEnable(String sid, String isEnable) {

anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue

@@ -100,27 +100,27 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="3" class="tleftb">
+            <el-col :span="3" class="tleftb" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">
               <span>常用配置</span>
             </el-col>
             <el-col :span="13" class="trightb tlineheightb">
               <el-form-item>{{ formobj.configName }}</el-form-item>
             </el-col>
-            <el-col :span="3" class="tleftb">
+            <el-col :span="3" class="tleftb" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">
               <span>内部编码</span>
             </el-col>
-            <el-col :span="5">
+            <el-col :span="5" class="trightb tlineheightb">
               <el-form-item>
-                <span>{{ formobj.insideCode }}</span>
+                {{ formobj.insideCode }}
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
-              <span>车辆型号</span>
+              <span><span class="icon">*</span>车辆型号</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item>
+              <el-form-item prop="vehMark">
                 <el-input v-model="formobj.vehMark" clearable placeholder="" class="addinputw"/>
               </el-form-item>
             </el-col>
@@ -450,7 +450,8 @@ export default {
         isSaleOrgApproval: [{ required: true, message: '是否销售部审批不能为空', trigger: 'change' }], // 是否销售部审批
         purchasePrice: [{ required: true, message: '采购价格不能为空', trigger: 'blur' }], // 采购价格
         num: [{ required: true, message: '台数不能为空', trigger: 'blur' }], // 台数
-        deposit: [{ required: true, message: '订金不能为空', trigger: 'blur' }] // 订金
+        deposit: [{ required: true, message: '订金不能为空', trigger: 'blur' }], // 订金
+        vehMark: [{ required: true, message: '车辆型号不能为空', trigger: 'blur' }] // 车辆型号
       }
     }
   },

anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationInfo.vue

@@ -58,13 +58,13 @@
         </el-row>
         <el-row>
           <el-col :span="3" class="tleftb">常用配置</el-col>
-          <el-col :span="13" class="trightb tlineheightb">
+          <el-col :span="13" class="tlineheightb">
             <el-form-item><span>{{ formobj.configName }}</span></el-form-item>
           </el-col>
           <el-col :span="3" class="tleftb">
             <span>内部编码</span>
           </el-col>
-          <el-col :span="5">
+          <el-col :span="5" class="tlineheightb">
             <el-form-item>
               <span>{{ formobj.insideCode }}</span>
             </el-form-item>

anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue

@@ -60,16 +60,14 @@
         </el-row>
         <el-row>
           <el-col :span="3" class="tleftb">常用配置</el-col>
-          <el-col :span="13" class="trightb tlineheightb">
+          <el-col :span="13" class="tlineheightb">
             <el-form-item><span>{{ formobj.configName }}</span></el-form-item>
           </el-col>
           <el-col :span="3" class="tleftb">
             <span>内部编码</span>
           </el-col>
-          <el-col :span="5">
-            <el-form-item>
-              <span>{{ formobj.insideCode }}</span>
-            </el-form-item>
+          <el-col :span="5" class="tlineheightb">
+            <el-form-item><span>{{ formobj.insideCode }}</span></el-form-item>
           </el-col>
         </el-row>
         <el-row>

anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd.vue

@@ -99,27 +99,25 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="3" class="tleftb">
+            <el-col :span="3" class="tleftb" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">
               <span><span class="icon">*</span>常用配置</span>
             </el-col>
-            <el-col :span="13" class="trightb tlineheightb">
+            <el-col :span="13" class="tlineheightb">
               <el-form-item>{{ formobj.configName }}</el-form-item>
             </el-col>
-            <el-col :span="3" class="tleftb">
+            <el-col :span="3" class="tleftb" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">
               <span>内部编码</span>
             </el-col>
-            <el-col :span="5">
-              <el-form-item>
-                <span>{{ formobj.insideCode }}</span>
-              </el-form-item>
+            <el-col :span="5" class="tlineheightb">
+              <el-form-item>{{ formobj.insideCode }}</el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb">
-              <span>车辆型号</span>
+              <span><span class="icon">*</span>车辆型号</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item>
+              <el-form-item prop="vehMark">
                 <el-input v-model="formobj.vehMark" clearable placeholder="" class="addinputw"/>
               </el-form-item>
             </el-col>
@@ -461,7 +459,8 @@ export default {
         purchasePrice: [{ required: true, message: '采购价格不能为空', trigger: 'blur' }], // 采购价格
         isSaleOrgApproval: [{ required: true, message: '是否销售部审批不能为空', trigger: 'change' }], // 是否销售部审批
         num: [{ required: true, message: '台数不能为空', trigger: 'blur' }], // 台数
-        deposit: [{ required: true, message: '订金不能为空', trigger: 'blur' }] // 订金
+        deposit: [{ required: true, message: '订金不能为空', trigger: 'blur' }], // 订金
+        vehMark: [{ required: true, message: '车辆型号不能为空', trigger: 'blur' }], // 车辆型号
       }
     }
   },

anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationInfo.vue

@@ -53,16 +53,14 @@
         </el-row>
         <el-row>
           <el-col :span="3" class="tleftb">常用配置</el-col>
-          <el-col :span="13" class="trightb tlineheightb">
+          <el-col :span="13" class="tlineheightb">
             <el-form-item><span>{{ formobj.configName }}</span></el-form-item>
           </el-col>
           <el-col :span="3" class="tleftb">
             <span>内部编码</span>
           </el-col>
-          <el-col :span="5">
-            <el-form-item>
-              <span>{{ formobj.insideCode }}</span>
-            </el-form-item>
+          <el-col :span="5" class="tlineheightb">
+            <el-form-item><span>{{ formobj.insideCode }}</span></el-form-item>
           </el-col>
         </el-row>
         <el-row>

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue

@@ -6,7 +6,7 @@
         <div class="searchcon">
           <el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">{{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}</el-button>
           <div v-show="isSearchShow" class="search">
-            <el-form :inline="true" class="tab-header" label-width="100px">
+            <el-form :inline="true" class="tab-header" label-width="110px">
               <el-form-item label="订单编号">
                 <el-input v-model="queryParams.params.orderNo" placeholder="请输入编号" clearable/>
               </el-form-item>
@@ -21,6 +21,9 @@
               <el-form-item label="车型" class="search_label">
                 <el-input v-model="queryParams.params.modelName" placeholder="请输入车型" clearable/>
               </el-form-item>
+              <el-form-item label="排产申请编号" class="search_label">
+                <el-input v-model="queryParams.params.applicationCode" placeholder="" clearable/>
+              </el-form-item>
               <el-form-item label="申请日期">
                 <el-date-picker v-model="queryParams.params.startDate" type="date" placeholder="选择日期">
                 </el-date-picker>
@@ -145,7 +148,8 @@ export default {
           endDate: '',
           modelName: '',
           staffSid: window.sessionStorage.getItem('staffSid'),
-          userSid: window.sessionStorage.getItem('userSid')
+          userSid: window.sessionStorage.getItem('userSid'),
+          applicationCode: ''
         }
       },
       row: {}
@@ -228,7 +232,8 @@ export default {
           endDate: '',
           modelName: '',
           staffSid: window.sessionStorage.getItem('staffSid'),
-          userSid: window.sessionStorage.getItem('userSid')
+          userSid: window.sessionStorage.getItem('userSid'),
+          applicationCode: ''
         }
       }
       this.dosearch()

anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue

@@ -9,6 +9,9 @@
           </el-button>
           <div v-show="isSearchShow" class="search">
             <el-form :inline="true" class="tab-header" label-width="120px">
+              <el-form-item label="排产申请编号:">
+                <el-input v-model="queryParams.params.pcApplicationCode" placeholder="" clearable/>
+              </el-form-item>
               <el-form-item label="采购订单编号:">
                 <el-input v-model="queryParams.params.purchaseOrderNo" placeholder="" clearable/>
               </el-form-item>
@@ -45,14 +48,15 @@
                 <el-button type="primary" size="small" @click="toInfo(scope.row)">查看</el-button>
               </template>
             </el-table-column>
-            <el-table-column label="状态" header-align="center">
+            <el-table-column label="状态" header-align="center" width="100">
               <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="applicationDate" label="申请日期" align="center" width="100"/>
-            <el-table-column prop="purchaseOrderNo" label="采购订单编号" align="center" width="200"/>
+            <el-table-column prop="pcApplicationCode" label="排产申请编号" align="center" width="170"/>
+            <el-table-column prop="purchaseOrderNo" label="采购订单编号" align="center" width="170"/>
             <el-table-column prop="modelName" label="车型" align="center"/>
             <el-table-column prop="vehicleNum" fit label="台数" align="center" width="60"/>
             <el-table-column prop="contractPrice" fit label="厂家合同价" align="center" width="130"/>
@@ -129,7 +133,8 @@ export default {
           nodeState: '',
           purchaseOrderNo: '',
           modelName: '',
-          createOrgSid: ''
+          createOrgSid: '',
+          pcApplicationCode: ''
         }
       },
       row: {}
@@ -230,7 +235,8 @@ export default {
           nodeState: '',
           purchaseOrderNo: '',
           modelName: '',
-          createOrgSid: ''
+          createOrgSid: '',
+          pcApplicationCode: ''
         }
       }
       this.init()

anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue

@@ -13,28 +13,24 @@
                   <el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
                 </el-select>
               </el-form-item>
-              <el-form-item label="打款状态">
-                <el-select v-model="listQuery.params.paymentState" placeholder="请选择" clearable class="addinputw">
-                  <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="认款日期">
-                <div class="block" style="float: left;">
-                  <el-date-picker v-model="listQuery.params.subscriptionStartDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
-                </div>
-                <div style="float: left;margin: 0px 10px">至</div>
-                <div class="block" style="float: left;">
-                  <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-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-select v-model="listQuery.params.applyTypeKey" placeholder="请选择" clearable>
                   <el-option v-for="item in applyType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
                 </el-select>
               </el-form-item>
+              <el-form-item label="打款状态">
+                <el-select v-model="listQuery.params.paymentState" placeholder="请选择" clearable>
+                  <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-date-picker v-model="listQuery.params.subscriptionStartDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.subscriptionEndDate" type="date" clearable 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" @click="handleFilter" size="small">查询</el-button>

anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichan.vue

@@ -7,8 +7,11 @@
           <el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">{{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}
           </el-button>
           <div v-show="isSearchShow" class="search">
-            <el-form :inline="true" class="tab-header" label-width="100px">
-              <el-form-item :model="queryParams" label="申请日期">
+            <el-form :inline="true" :model="queryParams" class="tab-header" label-width="100px">
+              <el-form-item label="申请编号">
+                <el-input v-model="queryParams.params.applicationCode" clearable placeholder=""/>
+              </el-form-item>
+              <el-form-item label="申请日期">
                 <el-date-picker value-format="yyyy-MM-dd" v-model="queryParams.params.applicationDateStart" clearable style="width: 160px;" type="date" placeholder="开始日期"/>
                 <div class="line">至</div>
                 <el-date-picker value-format="yyyy-MM-dd" v-model="queryParams.params.applicationDateEnd" clearable style="width: 160px;" type="date" placeholder="结束日期"/>
@@ -45,19 +48,19 @@
                 <el-button type="primary" size="small" @click="toInfo(scope.row)">查看</el-button>
               </template>
             </el-table-column>
-            <el-table-column label="状态" width="150px" header-align="center">
+            <el-table-column label="状态" width="90" 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 width="150" prop="applyType" 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="170" prop="applicationCode" label="申请编号" align="center"/>
+            <el-table-column width="100" prop="applicationDate" label="申请日期" align="center"/>
+            <el-table-column width="100" prop="applyType" label="采购类型" align="center"/>
+            <el-table-column width="100" prop="schedulingType" label="采购原因" align="center"/>
             <el-table-column width="150" prop="createOrgName" label="分公司" align="center"/>
-            <el-table-column width="150" prop="createByName" label="申请人" align="center"/>
-            <el-table-column width="150" prop="applyForDeposit" label="申请订金" align="center"/>
+            <el-table-column width="90" prop="createByName" label="申请人" align="center"/>
+            <el-table-column width="100" prop="applyForDeposit" label="申请订金" align="center"/>
             <el-table-column prop="remarks" fit label="备注" align="left" header-align="center"/>
           </el-table>
         </div>
@@ -149,6 +152,7 @@ export default {
         size: 10,
         total: 0,
         params: {
+          applicationCode: '',
           applicationDateStart: '',
           applicationDateEnd: '',
           applyTypeKey: '',
@@ -269,7 +273,8 @@ export default {
           size: 10,
           total: 0,
           params: {
-          applicationDateStart: '',
+            applicationCode: '',
+            applicationDateStart: '',
             applicationDateEnd: '',
             applyTypeKey: '',
             schedulingTypeKey: '',

anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangeng.vue

@@ -16,9 +16,22 @@
                 <el-date-picker v-model="listQuery.params.applyDateEnd" type="date" value-format="yyyy-MM-dd" placeholder="选择日期">
                 </el-date-picker>
               </el-form-item>
-<!--              <el-form-item label="车架号">-->
-<!--                <el-input v-model="listQuery.params.vin" placeholder="请输入名称" clearable/>-->
-<!--              </el-form-item>-->
+              <el-form-item label="申请编号">
+                <el-input v-model="listQuery.params.applyId" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="现存放地点">
+                <el-select v-model="listQuery.params.locationSid" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in warehouwarehouse_list" :key="item.sid" :label="item.dictValue" :value="item.sid"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="目标存放地点">
+                <el-select v-model="listQuery.params.targetLocationSid" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in warehouwarehouse_list" :key="item.sid" :label="item.dictValue" :value="item.sid"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="经办人">
+                <el-input v-model="listQuery.params.operator" 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="getList">查询</el-button>
@@ -45,7 +58,7 @@
                 <el-button size="mini" type="primary" @click="handleCheck(row)">查看</el-button>
               </template>
             </el-table-column>
-            <el-table-column width="180px" prop="state" label="状态" header-align="center" align="left">
+            <el-table-column width="100px" prop="state" label="状态" header-align="center" align="left">
               <template slot-scope="scope">
                 <span v-if="scope.row.state=='待提交'" type="primary" size="mini">待提交</span>
                 <span v-else @click="flowRecord(scope.row)" style="color: #018ad2;cursor: pointer;">{{ scope.row.state }}</span>
@@ -262,7 +275,8 @@ import {
   selectCarTransferList,
   temporaryExitPermitInfo,
   getErtraState,
-  saveCarTransferSiteImage
+  saveCarTransferSiteImage,
+  selectWarehouseByUserSid
 } from '@/api/supplychain/cunfangdidianbiangeng'
 import { getUseOrgByUserSid, selectModelName } from '@/api/cheliang/basevehicle'
 import ButtonBar from '@/components/ButtonBar'
@@ -293,6 +307,7 @@ export default {
       isSearchShow: false,
       tableLoading: false,
       dialogImgVisible: false,
+      warehouwarehouse_list: [], // 存放地点
       formobj: {
         sid: '',
         userSid: '',
@@ -321,6 +336,10 @@ export default {
           applyDateStart: '',
           applyDateEnd: '',
           vin: '',
+          applyId: '',
+          targetLocationSid: '',
+          locationSid: '',
+          operator: '',
           userSid: window.sessionStorage.getItem('userSid')
         }
       },
@@ -549,6 +568,10 @@ export default {
           applyDateStart: '',
           applyDateEnd: '',
           vin: '',
+          applyId: '',
+          targetLocationSid: '',
+          locationSid: '',
+          operator: '',
           userSid: window.sessionStorage.getItem('userSid')
         }
       }
@@ -626,6 +649,11 @@ export default {
           this.modelName_list = response.data
         }
       })
+      selectWarehouseByUserSid(window.sessionStorage.getItem('userSid')).then((res) => {
+        if (res.success) {
+          this.warehouwarehouse_list = res.data
+        }
+      })
     },
     // 根据个人sid查询个人分公司
     getUseOrg() {