Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
God 3 years ago
parent
commit
963f9a6bd9
  1. 27
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java
  2. 40
      anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliInfo.vue
  3. 61
      anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliInfo.vue
  4. 10
      anrui-scm/anrui-scm-ui/src/views/workFlow/cunfangdidianbiangengFlow/cunfangdidianbiangeng.vue

27
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java

@ -180,27 +180,6 @@ public class FlowableRest implements FlowableFeign {
}else{
Object o = task_map.get("candidateGroups");
return getNextUserSids(rb, orgSidPath, o);
/* //如果不是最后一个环节 要取下一个环节的角色sid
List<String> candidateGroups= (List<String>) task_map.get("candidateGroups");
String roleSid=candidateGroups.get(0);
//根据组织架构、角色两个参数取相关符合条件的用户信息
UserQuery userQuery = new UserQuery();
userQuery.setRoleSid(roleSid);
userQuery.setOrgSidPath(orgSidPath);
List<SysUserVo> sysUserVos = sysUserFeign.getUserByRole(userQuery).getData();
if(sysUserVos==null||sysUserVos.size()<1){
return rb.setMsg("环节没有用户");
}
StringBuilder nextNodeUserSids = new StringBuilder();
for (SysUserVo su : sysUserVos) {
nextNodeUserSids.append(su.getSid()).append(",");
}
//符合条件的用户的sid,拼接的字符串
String nextNodeUserSids_ = nextNodeUserSids.toString();
if(StringUtils.isBlank(nextNodeUserSids_))
return rb.setMsg("环节没有用户");
nextNodeUserSids_ = nextNodeUserSids_.substring(0, nextNodeUserSids_.length() - 1);
return rb.setData(nextNodeUserSids_);*/
}
}
@ -240,10 +219,10 @@ public class FlowableRest implements FlowableFeign {
return rb.setMsg("taskId 不能为空!");
}
ResultBean<String> resultBean = getNextNodeUserSidsOfSubmit(dto);
String nextUserSid=resultBean.getData();
/* if (StringUtils.isBlank(nextUserSid)) {
if (!resultBean.getSuccess()) {
return rb.setMsg("nextUserSid 不能为空!");
}*/
}
String nextUserSid=resultBean.getData();
String comment = dto.getComment();
if (StringUtils.isBlank(comment)) {
return rb.setMsg("comment 不能为空!");

40
anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliInfo.vue

@ -50,23 +50,33 @@
<span>附件</span>
</el-col>
<el-col :span="21">
<img v-show="temp.image ? true : false" v-for="item in temp.image"
<!-- <el-image-->
<!-- style="width: 178px;height: 178px;"-->
<!-- v-for="(item,index) in temp.image"-->
<!-- :key="index"-->
<!-- :src="item"-->
<!-- :preview-src-list="temp.image">-->
<!-- </el-image>-->
<img v-show="temp.image ? true : false" v-for="(item,index) in temp.image"
style="cursor:pointer;width: 178px;height: 178px;"
:src="item" @click="open(temp.image)">
:src="item" @click="open(temp.image, index)">
</el-col>
</el-row>
</el-form>
</div>
<el-dialog :visible.sync="dialogVisible" width="1000px"
:close-on-click-modal="false">
<div class="result-cont">
<el-carousel indicator-position="outside" style="height: 500px;">
<el-carousel-item v-for="item in dialogUrl" :key="item" style="height: 500px;">
<img style="width: 100%; height: 500px;" :src="item">
</el-carousel-item>
</el-carousel>
</div>
<el-dialog :visible.sync="dialogVisible">
<img width="100%" :src="dialogImageUrl" alt="">
</el-dialog>
<!-- <el-dialog :visible.sync="dialogVisible" width="1000px"-->
<!-- :close-on-click-modal="false">-->
<!-- <div class="result-cont">-->
<!-- <el-carousel indicator-position="outside" style="height: 500px;">-->
<!-- <el-carousel-item v-for="item in dialogUrl" :key="item" style="height: 500px;">-->
<!-- <img style="width: 100%; height: 500px;" :src="item">-->
<!-- </el-carousel-item>-->
<!-- </el-carousel>-->
<!-- </div>-->
<!-- </el-dialog>-->
</div>
</template>
@ -84,8 +94,9 @@ export default {
stateId: 0,
FormLoading: false,
listLoading: false,
dialogVisible:false,
dialogUrl:'',
dialogVisible: false,
dialogUrl: '',
dialogImageUrl: '',
warehouse_list: [],
imgList: [], //
temp: {
@ -118,9 +129,10 @@ export default {
}
})
},
open(val) {
open(val, index) {
this.dialogVisible = true
this.dialogUrl = val
this.dialogImageUrl = val[index]
},
handleReturn() {
this.temp = {

61
anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliInfo.vue

@ -40,10 +40,17 @@
</div>
<div class="title">验车相关照片</div>
<el-row>
<el-col :span="24"> <!-- v-for="item in imgList01" :src="item" @click="open(item)-->
<img v-show="temp.carInspectedImage ? true : false" v-for="item in temp.carInspectedImage"
style="cursor:pointer;width: 178px;height: 178px;"
:src="item" @click="open(temp.carInspectedImage)">
<el-col :span="24">
<el-image
style="width: 178px;height: 178px;"
v-for="(item,index) in temp.carInspectedImage"
:key="index"
:src="item"
:preview-src-list="temp.carInspectedImage">
</el-image>
<!-- <img v-show="temp.carInspectedImage ? true : false" v-for="(item,index) in temp.carInspectedImage"-->
<!-- style="cursor:pointer;width: 178px;height: 178px;"-->
<!-- :src="item" @click="open(temp.carInspectedImage,index)">-->
</el-col>
</el-row>
<el-row>
@ -51,9 +58,16 @@
<span>厂家验车单照片</span>
</el-col>
<el-col :span="21">
<img v-show="temp.factoryImage ? true : false" v-for="item in temp.factoryImage"
style="cursor:pointer;width: 178px;height: 178px;"
:src="item" @click="open(temp.factoryImage)">
<el-image
style="width: 178px;height: 178px;"
v-for="(item,index) in temp.factoryImage"
:key="index"
:src="item"
:preview-src-list="temp.factoryImage">
</el-image>
<!-- <img v-show="temp.factoryImage ? true : false" v-for="(item,index) in temp.factoryImage"-->
<!-- style="cursor:pointer;width: 178px;height: 178px;"-->
<!-- :src="item" @click="open(temp.factoryImage,index)">-->
</el-col>
</el-row>
<el-row>
@ -69,16 +83,19 @@
</el-form>
</div>
</div>
<el-dialog :visible.sync="dialogVisible" width="1000px"
:close-on-click-modal="false">
<div class="result-cont">
<el-carousel indicator-position="outside" style="height: 500px;">
<el-carousel-item v-for="item in dialogUrl" :key="item" style="height: 500px;">
<img style="width: 100%; height: 500px;" :src="item">
</el-carousel-item>
</el-carousel>
</div>
<el-dialog :visible.sync="dialogVisible">
<img width="100%" :src="dialogImageUrl" alt="">
</el-dialog>
<!-- <el-dialog :visible.sync="dialogVisible" width="1000px"-->
<!-- :close-on-click-modal="false">-->
<!-- <div class="result-cont">-->
<!-- <el-carousel indicator-position="outside" style="height: 500px;">-->
<!-- <el-carousel-item v-for="item in dialogUrl" :key="item" style="height: 500px;">-->
<!-- <img style="width: 100%; height: 500px;" :src="item">-->
<!-- </el-carousel-item>-->
<!-- </el-carousel>-->
<!-- </div>-->
<!-- </el-dialog>-->
</div>
</template>
@ -92,17 +109,16 @@ export default {
viewTitle: '',
// ---------
sid: '',
dialogVisible:false,
dialogVisible: false,
datas: null,
stateId: 0,
FormLoading: false,
listLoading: false,
dialogUrl:'',
dialogUrl: [],
dialogImageUrl: '',
imgList01: [], //
imgList02: [], //
temp: {
}, //
temp: {}, //
dialogFormVisible: false, //
dialogFormShowVisible: false, //
dialogStatus: '', //
@ -128,9 +144,10 @@ export default {
}
})
},
open(val) {
open(val, index) {
this.dialogVisible = true
this.dialogUrl = val
this.dialogImageUrl = val[index]
}
}
}

10
anrui-scm/anrui-scm-ui/src/views/workFlow/cunfangdidianbiangengFlow/cunfangdidianbiangeng.vue

@ -138,7 +138,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-row style="border-bottom: 1px solid #e0e3eb;">
<el-col :span="4" class="tleftb">意见</el-col>
<el-col :span="20" class="trightb">
<el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw"
@ -477,4 +477,12 @@ export default {
.title{
text-align: center;
}
.tleftb{
border-bottom: 0 !important;
border-top: 1px solid #e0e3eb;
}
.trightb{
border-bottom: 0 !important;
border-top: 1px solid #e0e3eb;
}
</style>

Loading…
Cancel
Save