Browse Source

Merge remote-tracking branch 'origin/master'

master
yxt_djz 3 years ago
parent
commit
7069bbae8a
  1. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java
  2. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java
  3. 17
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerListQuery.java
  4. 19
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerListVo.java
  5. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java
  6. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java
  7. 7
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java
  8. 10
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetail.java
  9. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailDto.java
  10. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailVo.java
  11. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java
  12. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml
  13. 11
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java
  14. 8
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java
  15. 27
      anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiAdd.vue
  16. 120
      anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiInfo.vue
  17. 2
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
  18. 5
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java
  19. 5
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java
  20. 17
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationListsVo.java
  21. 1
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java
  22. 6
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml
  23. 5
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java
  24. 12
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java
  25. 5
      anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue
  26. 11
      anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue
  27. 4
      anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAlready.vue
  28. 4
      anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAwait.vue
  29. 4
      anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanli.vue
  30. 5
      anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue
  31. 5
      anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue
  32. 5
      anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue
  33. 8
      anrui-system-ui/src/api/system/dictType/index.js
  34. 7
      anrui-system-ui/src/views/dictManage/dictMap.vue

6
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java

@ -7,6 +7,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@ -160,4 +161,9 @@ public interface BaseManufacturerFeign {
@ResponseBody
public ResultBean<BaseManufacturerVo> queryBycertOrg(@PathVariable("certOrg") String certOrg);
@ApiOperation("厂家采购获取分公司销售通路")
@GetMapping("/selectNameByOrg")
@ResponseBody
ResultBean<List<BaseManufacturerListVo>> selectNameByOrg(@SpringQueryMap BaseManufacturerListQuery query);
}

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java

@ -90,4 +90,9 @@ public class BaseManufacturerFeignFallback implements BaseManufacturerFeign {
public ResultBean<BaseManufacturerVo> queryBycertOrg(String certOrg) {
return null;
}
@Override
public ResultBean<List<BaseManufacturerListVo>> selectNameByOrg(BaseManufacturerListQuery query) {
return null;
}
}

17
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerListQuery.java

@ -0,0 +1,17 @@
package com.yxt.anrui.base.api.basemanufacturer;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2022/9/30 10:57
* @Description
*/
@Data
public class BaseManufacturerListQuery implements Query {
private static final long serialVersionUID = -8298971718012436562L;
@ApiModelProperty("分公司sid")
private String useOrgSid;
}

19
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerListVo.java

@ -0,0 +1,19 @@
package com.yxt.anrui.base.api.basemanufacturer;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2022/9/30 10:55
* @Description
*/
@Data
public class BaseManufacturerListVo implements Vo {
private static final long serialVersionUID = 4951280280938626700L;
@ApiModelProperty("供应商sid")
private String sid;
@ApiModelProperty("供应商销售通路")
private String name;
}

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java

@ -67,4 +67,9 @@ public class BusVehicleApply extends BaseEntity {
private String userSids;
private String userNames;
@ApiModelProperty("采购部门名称")
private String orgDeptName;
@ApiModelProperty("采购部门sid")
private String orgDeptSid;
}

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java

@ -57,4 +57,9 @@ public class BusVehicleApplyDetailsVo implements Vo {
private String userSids;
private String userNames;
private String nodeState;
@ApiModelProperty("采购部门名称")
private String orgDeptName;
@ApiModelProperty("采购部门sid")
private String orgDeptSid;
}

7
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java

@ -63,8 +63,13 @@ public class BusVehicleApplyDto implements Dto {
@ApiModelProperty("订金付款备注")
private String payRemarks;
@ApiModelProperty("选择的销售经理sid")
private String userSids;
private String userNames;
@ApiModelProperty("采购部门名称")
private String orgDeptName;
@ApiModelProperty("采购部门sid")
private String orgDeptSid;
}

10
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetail.java

@ -25,13 +25,13 @@ import lombok.Data;
public class BusVehicleApplyDetail extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("排产申请sid")
@ApiModelProperty("排产申请sid")
private String applySid;
@ApiModelProperty("车型sid")
@ApiModelProperty("车型sid")
private String vehicleSid;
@ApiModelProperty("车型名称")
@ApiModelProperty("车型名称")
private String vehicleName;
@ApiModelProperty("排产数量")
@ApiModelProperty("排产数量")
private String quantity;
@ApiModelProperty("使用订金")
private Integer useDeposit;
@ -50,4 +50,6 @@ public class BusVehicleApplyDetail extends BaseEntity {
@ApiModelProperty("厂家销售通路")
private String actualPay;
@ApiModelProperty("厂家销售通路sid")
private String actualSid;
}

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailDto.java

@ -45,7 +45,7 @@ public class BusVehicleApplyDetailDto implements Dto {
@ApiModelProperty("申请订金")
private String applyForDeposit;
@ApiModelProperty("备注")
private String remarks; // 备注
private String remarks;
@ApiModelProperty("内部编码")
private String insideCode;
@ApiModelProperty(value = "厂家合同价")
@ -54,4 +54,6 @@ public class BusVehicleApplyDetailDto implements Dto {
private BusVehicleApplySzDto busVehicleApplySz;
@ApiModelProperty("厂家销售通路")
private String actualPay;
@ApiModelProperty("厂家销售通路sid")
private String actualSid;
}

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailVo.java

@ -57,4 +57,6 @@ public class BusVehicleApplyDetailVo implements Vo {
private Integer guidePrice;
@ApiModelProperty("厂家销售通路")
private String actualPay;
@ApiModelProperty("厂家销售通路sid")
private String actualSid;
}

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java

@ -117,4 +117,6 @@ public interface BaseManufacturerMapper extends BaseMapper<BaseManufacturer> {
List<Map<String, String>> wcgysNamesDown(String orgSid);
List<Map<String, String>> bankNamesDown(String manufacturerSid);
List<BaseManufacturerListVo> selectNameByOrg(@Param("useOrgSid") String useOrgSid, @Param("supplierTypeValue") String supplierTypeValue);
}

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml

@ -164,4 +164,8 @@
WHERE manufacturerSid = #{manufacturerSid}
AND isDelete = 0
</select>
<select id="selectNameByOrg" resultType="com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerListVo">
select sid,manufacturerName as name from base_manufacturer where useOrg = #{useOrgSid} and supplierTypeValue=#{supplierTypeValue}
</select>
</mapper>

11
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java

@ -1,15 +1,10 @@
package com.yxt.anrui.base.biz.basemanufacturer;
import com.auth0.jwt.JWT;
import com.auth0.jwt.interfaces.DecodedJWT;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basemanufacturer.*;
import com.yxt.anrui.base.biz.basemanufacturerbank.BaseManufacturerBankService;
import com.yxt.anrui.base.biz.basemanufacturerfinance.BaseManufacturerFinanceService;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.common.base.utils.ExportExcelUtils;
import com.yxt.common.base.utils.JWTUtil;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@ -19,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
@ -168,4 +162,9 @@ public class BaseManufacturerRest implements BaseManufacturerFeign {
BaseManufacturerVo vo = baseManufacturerService.queryBycertOrg(certOrg);
return rb.success().setData(vo);
}
@Override
public ResultBean<List<BaseManufacturerListVo>> selectNameByOrg(BaseManufacturerListQuery query) {
return baseManufacturerService.selectNameByOrg(query);
}
}

8
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java

@ -407,4 +407,12 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
List<Map<String,String>> bankNames = baseMapper.bankNamesDown(manufacturerSid);
return rb.success().setData(bankNames);
}
public ResultBean<List<BaseManufacturerListVo>> selectNameByOrg(BaseManufacturerListQuery query) {
ResultBean<List<BaseManufacturerListVo>> rb = ResultBean.fireFail();
String useOrgSid = query.getUseOrgSid();
String supplierTypeValue = "主机厂";
List<BaseManufacturerListVo> list = baseMapper.selectNameByOrg(useOrgSid,supplierTypeValue);
return rb.success().setData(list);
}
}

27
anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiAdd.vue

@ -25,6 +25,12 @@
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item prop="brandShortName">
<span slot="label">品牌简称</span>
<el-input v-model="temp.brandShortName" maxlength="125" placeholder="" class="addinputw" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="brandType">
<span slot="label">品牌类型</span>
@ -33,26 +39,27 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="isValidity">
<span slot="label">是否有效</span>
<el-select v-model="temp.isValidity" class="addinputw" placeholder="请选择是否有效">
<el-option v-for="(item,index) in isValiditys" :key="index" :label="item.dictValue" :value="item.sid" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item prop="manufacturerSid">
<span slot="label">厂商名称</span>
<el-select v-model="temp.manufacturerSid" class="addinputw" filterable placeholder="请选择厂商名称">
<el-option v-for="item in supplierType" :key="item.sid" :label="item.manufacturerName"
:value="item.sid" />
<el-option v-for="item in supplierType" :key="item.sid" :label="item.manufacturerName" :value="item.sid" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="isValidity">
<span slot="label">是否有效</span>
<el-select v-model="temp.isValidity" class="addinputw" placeholder="请选择是否有效">
<el-option v-for="(item,index) in isValiditys" :key="index" :label="item.dictValue" :value="item.sid" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item prop="useOrg">
<span slot="label">使用组织</span>
<el-select v-model="useOrgValue" multiple placeholder="请选择" filterable clearable class="addinputw"

120
anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiInfo.vue

@ -3,30 +3,33 @@
<div class="tab-header webtop">
<div>品牌详情</div>
<div>
<!-- <el-button type="primary" size="small" @click="handleCreate()">保存</el-button> -->
<el-button type="info" size="small" @click="handleReturn()">返回</el-button>
</div>
</div>
<div class="listconadd">
<el-form ref="dataForm" :model="templook" label-position="right" label-width="190px" class="forminfo" :rules="rules">
<el-form ref="dataForm" :model="templook" class="forminfo" :rules="rules">
<div class="title">品牌信息</div>
<el-row>
<el-col :span="4" class="trightb">品牌编码</el-col>
<el-col :span="8" class="tleft"> {{ templook.brandCode }} </el-col>
<el-col :span="4" class="trightb">品牌名称</el-col>
<el-col :span="8" class="tleft"> {{ templook.brandName }} </el-col>
<el-col :span="4" class="trightb">品牌编码</el-col>
<el-col :span="8" class="tleft"> {{ templook.brandCode }}</el-col>
<el-col :span="4" class="trightb">品牌名称</el-col>
<el-col :span="8" class="tleft"> {{ templook.brandName }}</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">品牌类型</el-col>
<el-col :span="8" class="tleft"> {{ templook.brandTypeValue }} </el-col>
<el-col :span="4" class="trightb">是否有效</el-col>
<el-col :span="8" class="tleft"> {{ templook.isValidityValue }} </el-col>
<el-col :span="4" class="trightb">品牌简称</el-col>
<el-col :span="8" class="tleft"> {{ templook.brandShortName }}</el-col>
<el-col :span="4" class="trightb">品牌类型</el-col>
<el-col :span="8" class="tleft"> {{ templook.brandTypeValue }}</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">厂商名称</el-col>
<el-col :span="8" class="tleft"> {{ templook.manufacturerName }} </el-col>
<el-col :span="4" class="trightb">使用组织</el-col>
<el-col :span="8" class="tleft"> {{ templook.useOrgName }} </el-col>
<el-col :span="4" class="trightb">厂商名称</el-col>
<el-col :span="8" class="tleft"> {{ templook.manufacturerName }}</el-col>
<el-col :span="4" class="trightb">是否有效</el-col>
<el-col :span="8" class="tleft"> {{ templook.isValidityValue }}</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">使用组织</el-col>
<el-col :span="20" class="tleft"> {{ templook.useOrgName }}</el-col>
</el-row>
</el-form>
</div>
@ -34,121 +37,44 @@
</template>
<script>
import { mapGetters } from 'vuex'
import { details } from '@/api/jichuxinxi/brandManagement'
// import { getFileType, parseDate, parseTime, ConvertMenuState } from "@/utils";
// import { findButtonByUserId } from '@/api/sys/permission'
export default {
name: 'PinpaiAdd',
// components: { },
data() {
return {
// ---------
menuState: {
add: false, //
edit: false, //
delete: false, //
view: false, //
audit: false, //
input: false, //
output: false, //
upload: false, //
release: false, //
},
FormLoading: false,
listLoading: false,
temp: {}, //
templook: {}, //
textMap: {
update: '修改',
create: '创建',
},
dialogFormVisible: false, //
dialogFormShowVisible: false, //
dialogStatus: '', //
fenzuOptions: [],
rules: {
title: [{ required: true, message: '请填写', trigger: 'blur' }],
qc: [{ required: true, message: '请填写全称', trigger: 'blur' }],
},
tempDate: {},
// ------------------------------------
rules: {}
}
},
computed: {
...mapGetters([
'id',
'roles',
'rolesIds',
'departmentId',
'departmentCode',
]),
},
created() {
// this.tempDate.sid = this.$route.query.sid
// console.log(33333333333, this.tempDate.sid)
// //
// this.init()
// //
// this.handleCheck()
},
methods: {
init() {
// .
// findButtonByUserId(this.$route.path).then(response => {
// if (
// response.code === 20000 &&
// response.data &&
// response.data.length > 0
// ) {
// this.menuState = ConvertMenuState(response.data) //
// }
// })
},
//
// indexMethod(index) {
// var pagestart = (this.listQuery.pageNumber - 1) * this.listQuery.pageSize
// var pageindex = index + 1 + pagestart
// return pageindex
// },
// ------------------------------------------------------
//
handleReturn() {
this.temp = {}
this.$emit('doback')
},
//
resetTemp() {
this.temp = {
jc: '', // false string
organizationId: '', // false string
qc: '', // false string
remark: '', // false
string: '', //
state: '', //
}
},
//
showInfo(sid) {
this.FormLoading = true
details(sid).then((response) => {
console.log('查询', response)
this.FormLoading = false
if (response.code === '200') {
if (response.success) {
this.templook = response.data
console.log('查询1', this.templook)
} else {
this.$notify({
title: '失败',
message: '查询失败',
type: 'error',
type: 'error'
})
}
})
},
},
}
}
}
</script>
<style scoped>

2
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java

@ -450,7 +450,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
.includeProcessVariables()
.includeTaskLocalVariables()
.or()
.taskVariableValueEquals("orgSidPath","111222333")
//.taskVariableValueEquals("orgSidPath","111222333")
//.taskCandidateGroupIn(roleSidList)
.taskAssigneeLike("%" + userSid + "%")
.endOr()

5
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java

@ -139,4 +139,9 @@ public interface SysOrganizationFeign {
@ResponseBody
@ApiOperation("当前分公司销售部门及部门人员")
ResultBean<List<SysOrganizationListVo>> selectOrgList(@SpringQueryMap SysOrganizationListQuery query);
@GetMapping("/selectOrgLists")
@ResponseBody
@ApiOperation("当前分公司下所有部门")
ResultBean<List<SysOrganizationListsVo>> selectOrgLists(@SpringQueryMap SysOrganizationListQuery query);
}

5
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java

@ -142,4 +142,9 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign {
public ResultBean<List<SysOrganizationListVo>> selectOrgList(SysOrganizationListQuery query) {
return null;
}
@Override
public ResultBean<List<SysOrganizationListsVo>> selectOrgLists(SysOrganizationListQuery query) {
return null;
}
}

17
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationListsVo.java

@ -0,0 +1,17 @@
package com.yxt.anrui.portal.api.sysorganization;
import com.yxt.common.core.vo.Vo;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2022/9/30 11:28
* @Description
*/
@Data
public class SysOrganizationListsVo implements Vo {
private static final long serialVersionUID = -7021974833444298712L;
private String orgDeptSid;
private String orgDeptName;
}

1
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java

@ -106,6 +106,7 @@ public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
SysOrgVo getListOrgByBrand(String sid);
List<SysOrganizationListVo> selectOrgList(String orgSid);
List<SysOrganizationListsVo> selectOrgLists(String orgSid);
List<SysOrgStaffVo> selectByOrgDeptSid(String orgDeptSid);
}

6
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml

@ -181,6 +181,12 @@
and orgAttributeKey = 'DP03_SYS'
</select>
<select id="selectOrgLists" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationListsVo">
select so.name orgDeptName, so.sid orgDeptSid
from sys_organization so
where so.psid = #{orgSid}
</select>
<select id="selectByOrgDeptSid" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrgStaffVo">
select distinct si.name staffName, si.sid staffSid
from sys_staff_org so

5
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java

@ -361,4 +361,9 @@ public class SysOrganizationRest implements SysOrganizationFeign {
public ResultBean<List<SysOrganizationListVo>> selectOrgList(SysOrganizationListQuery query) {
return sysOrganizationService.selectOrgList(query);
}
@Override
public ResultBean<List<SysOrganizationListsVo>> selectOrgLists(SysOrganizationListQuery query) {
return sysOrganizationService.selectOrgLists(query);
}
}

12
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java

@ -495,4 +495,16 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
}
return rb.success().setData(sysOrganizationListVos);
}
public ResultBean<List<SysOrganizationListsVo>> selectOrgLists(SysOrganizationListQuery query) {
ResultBean<List<SysOrganizationListsVo>> rb = ResultBean.fireFail();
//根据用户sid查询分公司sid
String orgDeptSid = sysStaffOrgService.selectByUserSid(query.getUserSid());
String orgSid = getOrgSid(orgDeptSid);
//根据分公司名称查询销售部门的部门
List<SysOrganizationListsVo> sysOrganizationListVos = baseMapper.selectOrgLists(orgSid);
sysOrganizationListVos.removeAll(Collections.singleton(null));
return rb.success().setData(sysOrganizationListVos);
}
}

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

@ -181,6 +181,11 @@
<el-input v-model="scope.row.vinNo" placeholder="" class="addinputw" @change="changeVinNo" clearable type="text" maxlength="17"/>
</template>
</el-table-column>
<el-table-column label="发动机号" align="left" header-align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.engineNo" placeholder="" class="addinputw" clearable/>
</template>
</el-table-column>
<el-table-column label="备注" header-align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.remarks" placeholder="" class="addinputw" clearable />

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

@ -178,14 +178,19 @@
<div>车辆列表</div>
</div>
<el-table :key="tableKey" :data="formobj.vehicleList" :index="index" border style="width: 100%">
<el-table-column fixed width="60px" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column label="车架号" align="left" header-align="center">
<template slot-scope="scope" prop="vehicleName">
<template slot-scope="scope">
{{ scope.row.vinNo }}
</template>
</el-table-column>
<el-table-column label="发动机号" align="left" header-align="center">
<template slot-scope="scope">
{{ scope.row.engineNo }}
</template>
</el-table-column>
<el-table-column label="备注" header-align="center">
<template slot-scope="scope" prop="remarks">
<template slot-scope="scope">
{{ scope.row.remarks }}
</template>
</el-table-column>

4
anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAlready.vue

@ -21,7 +21,7 @@
<el-option v-for="item in modelName_list" :key="item.sid" :label="item.modelName" :value="item.sid"/>
</el-select>
</el-form-item>
<el-form-item label="订单类型">
<el-form-item label="采购类型">
<el-select v-model="listQuery.params.purchaseType" placeholder="请选择" clearable class="addinputw">
<el-option v-for="item in purchaseType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
@ -60,7 +60,7 @@
</el-table-column>
<el-table-column width="180px" prop="vin" label="车架号" align="center"/>
<el-table-column prop="model" label="车型" align="center"/>
<el-table-column width="160px" prop="purchaseType" label="订单类型" align="center"/>
<el-table-column width="160px" prop="purchaseType" label="采购类型" align="center"/>
<el-table-column width="140px" prop="dispatchedDate" label="发车日期" align="center"/>
<el-table-column width="140px" prop="inspectedDate" label="验车日期" align="center"/>
<el-table-column width="140px" prop="inspectedName" label="验车人" align="center"/>

4
anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAwait.vue

@ -21,7 +21,7 @@
<el-option v-for="item in modelName_list" :key="item.sid" :label="item.modelName" :value="item.sid"/>
</el-select>
</el-form-item>
<el-form-item label="订单类型">
<el-form-item label="采购类型">
<el-select v-model="listQuery.params.purchaseType" placeholder="请选择" clearable class="addinputw">
<el-option v-for="item in purchaseType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
@ -51,7 +51,7 @@
</el-table-column>
<el-table-column width="180px" prop="vin" label="车架号" align="center"/>
<el-table-column prop="model" label="车型" align="center"/>
<el-table-column width="160px" prop="purchaseType" label="订单类型" align="center"/>
<el-table-column width="160px" prop="purchaseType" label="采购类型" align="center"/>
<el-table-column width="140px" prop="dispatchedDate" label="发车日期" align="center"/>
<el-table-column width="140px" prop="inspectedDate" label="验车日期" align="center"/>
<el-table-column width="140px" prop="inspectedName" label="验车人" align="center"/>

4
anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanli.vue

@ -22,7 +22,7 @@
<el-form-item label="车架号">
<el-input v-model="listQuery.params.vin" placeholder="请输入车架号" clearable/>
</el-form-item>
<el-form-item label="订单类型">
<el-form-item label="采购类型">
<el-select v-model="listQuery.params.purchaseType" placeholder="请选择" clearable class="addinputw">
<el-option v-for="item in purchaseType_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey"/>
@ -64,7 +64,7 @@
</el-table-column>
<el-table-column width="200px" prop="vin" label="车架号" align="center"/>
<el-table-column prop="model" label="车型" align="center"/>
<el-table-column width="160px" prop="purchaseType" label="订单类型" align="center"/>
<el-table-column width="160px" prop="purchaseType" label="采购类型" align="center"/>
<el-table-column width="140px" prop="dispatchedDate" label="发车日期" align="center"/>
<el-table-column width="140px" prop="inspectedDate" label="验车日期" align="center"/>
<el-table-column width="140px" prop="inspectedName" label="验车人" align="center"/>

5
anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue

@ -186,6 +186,11 @@
{{ scope.row.vinNo }}
</template>
</el-table-column>
<el-table-column label="发动机号" align="left" header-align="center">
<template slot-scope="scope">
{{ scope.row.engineNo }}
</template>
</el-table-column>
<el-table-column label="备注" header-align="center">
<template slot-scope="scope" prop="remarks">
{{ scope.row.remarks }}

5
anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue

@ -180,6 +180,11 @@
<el-input v-model="scope.row.vinNo" placeholder="" class="addinputw" @change="changeVinNo" clearable type="text" maxlength="17"/>
</template>
</el-table-column>
<el-table-column label="发动机号" align="left" header-align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.engineNo" placeholder="" class="addinputw" clearable/>
</template>
</el-table-column>
<el-table-column label="备注" header-align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.remarks" placeholder="" class="addinputw" clearable />

5
anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue

@ -184,6 +184,11 @@
{{ scope.row.vinNo }}
</template>
</el-table-column>
<el-table-column label="发动机号" align="left" header-align="center">
<template slot-scope="scope">
{{ scope.row.engineNo }}
</template>
</el-table-column>
<el-table-column label="备注" header-align="center">
<template slot-scope="scope" prop="remarks">
{{ scope.row.remarks }}

8
anrui-system-ui/src/api/system/dictType/index.js

@ -53,6 +53,14 @@ export function saveMappingList(data) {
})
}
// 数据字段--映射管理保存
export function selectMappingListInfo(sid) {
return request({
url: '/portal/v1/sysmapping/selectMappingListInfo/' + sid,
method: 'get',
})
}
// 根据sid 删除菜单 信息
export function delDictType(data) {
return request({

7
anrui-system-ui/src/views/dictManage/dictMap.vue

@ -59,7 +59,7 @@
<script>
import { typeValues } from '@/api/system/roleAdminister/index'
import {saveMappingList } from '@/api/system/dictType/index.js'
import { saveMappingList, selectMappingListInfo } from '@/api/system/dictType/index.js'
export default {
data() {
return{
@ -85,6 +85,11 @@ export default {
this.mappingsource_list = resp.data
}
})
selectMappingListInfo(row.sid).then((resp) => {
if (resp.success) {
this.list = resp.data
}
})
},
Add() {
this.list.push({

Loading…
Cancel
Save