zcdsj
/
hberp
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop

This commit is contained in:
曹前明 2022-06-13 09:29:46 +08:00
parent b05d6349d2 38ca0424e3
commit 305d0a0f2f
9 changed files with 483 additions and 320 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hb_client/src/components/customForm/index.vue
View File

@ -3,7 +3,7 @@
<el-form
id="customerForm"
ref="checkForm"
label-width="100px"
label-width="150px"
:model="checkForm"
>
<el-row>
@ -32,8 +32,8 @@
required
>
<el-input-number
style="width: 100%;"
v-model="checkForm[item.field_key]"
style="width: 100%;"
step-strictly
placeholder="请输入"
:min="0"
@ -46,8 +46,8 @@
required
>
<el-input-number
style="width: 100%;"
v-model="checkForm[item.field_key]"
style="width: 100%;"
:precision="2"
:step="0.1"
placeholder="请输入"
@ -229,7 +229,7 @@
that.is_save = true;
} else {
that.checkForm[key] = '';
that.$set(that.checkForm, key, null)
that.$set(that.checkForm, key, '')
}
}
let listJudge = this.formData.filter(item => {
@ -337,7 +337,7 @@
that.formData[index].is_hidden = false;
} else {
that.formData[index].is_hidden = true;
that.checkForm[field_key] = null;
that.checkForm[field_key] = '';
}
return rea;
} else {
@ -350,7 +350,7 @@
that.formData[index].is_hidden = false;
} else {
that.formData[index].is_hidden = true;
that.checkForm[field_key] = null;
that.checkForm[field_key] = '';
}
return eval(eval(a));
}

6
hb_client/src/components/customForm/review.vue
View File

@ -3,7 +3,7 @@
<el-form
id="customerForm"
ref="checkForm"
label-width="100px"
label-width="150px"
:model="checkForm"
>
<el-row>
@ -429,7 +429,7 @@
that.formData[index].is_hidden = false;
}else{
that.formData[index].is_hidden = true;
that.checkForm[field_key] = null;
that.checkForm[field_key] = '';
}
return rea;
}else{
@ -442,7 +442,7 @@
that.formData[index].is_hidden = false;
}else{
that.formData[index].is_hidden = true;
that.checkForm[field_key] = null;
that.checkForm[field_key] = '';
}
return eval(eval(a));
}

31
hb_client/src/views/inm/fifo.vue
View File

@ -349,7 +349,9 @@
<el-input v-model="item.batch" placeholder="批次号"></el-input>
</el-form-item>
</el-col>
<el-col :span="5" style="margin-right: 10px">
</el-row>
<el-row>
<el-col :span="5">
<el-form-item
class="expiration_date"
label="有效期"
@ -365,6 +367,21 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="18">
<el-form-item label="物料编号:">
<div v-for="(ob,ind) in item.details" :key="ob.number" style="display: inline-block">
<span>{{ob.number}}</span>
<el-button
v-if="ob.number!==''"
@click="deleteItemNumber(index,ind)"
style="border: none;background: none;padding: 0;margin-top: 4px;"
>
<i class="el-icon-remove-outline" style="font-size: 20px"></i>
</el-button>
</div>
<el-input style="width: 300px;" clearable v-model="itemDetails" placeholder="物料编号,回车确定编号" @keyup.enter.native="detailEnter(itemDetails,index)"></el-input>
</el-form-item>
</el-col>
<!-- 删除按钮 -->
<el-col :span="1">
<el-tooltip
@ -448,6 +465,7 @@ const defaulteinventory = {
material: "", // 物料
count: "", //数量
batch: "", //批次
details:[],
},
],
};
@ -469,6 +487,7 @@ export default {
fifoList: {
count: 0,
},
itemDetails:'',
types_: {
1: "生产领料",
2: "销售提货",
@ -506,8 +525,14 @@ export default {
this.getpuorderList();
},
methods: {
detailEnter(item,index){
this.inventory.details[index].details.push({number:item});
this.itemDetails = '';
},
deleteItemNumber(index,ind){
this.inventory.details[index].details.splice(ind,1);
},
checkPermission,
getList() {
this.listLoading = true;
@ -582,6 +607,7 @@ export default {
material: "", // 物料
count: "", //数量
batch: "", // 批次
details:[]
});
} else {
this.$message("最多可添加十项条件");
@ -612,6 +638,7 @@ export default {
material: "", // 物料
count: "", //数量
batch: "", //批次
details:[],
},
];
this.inventory = Object.assign({}, defaulteinventory);

28
hb_client/src/views/mtm/material.vue
View File

@ -261,8 +261,7 @@
}, {
value: '套',
label: '套'
},
{
}, {
value: '个',
label: '个'
}, {
@ -271,6 +270,24 @@
}, {
value: '瓶',
label: '瓶'
}, {
value: 'g',
label: 'g'
}, {
value: 'kg',
label: 'kg'
}, {
value: '卷',
label: '卷'
}, {
value: '张',
label: '张'
}, {
value: '支',
label: '支'
}, {
value: '袋',
label: '袋'
},
],
listQuery: {
@ -343,12 +360,19 @@
//检查表
handlebind(scope) {
let materialItem = sessionStorage.getItem('materialItem');
let materialType = sessionStorage.getItem('materialType');
if(materialItem){
sessionStorage.removeItem('materialItem');
sessionStorage.setItem('materialItem',JSON.stringify(scope.row));
}else{
sessionStorage.setItem('materialItem',JSON.stringify(scope.row));
}
if(materialType){
sessionStorage.removeItem('materialType');
sessionStorage.setItem('materialType','30');
}else{
sessionStorage.setItem('materialType','30');
}
this.$router.push({name: "MaterialDO", params: {id: scope.row.id}})
},
handleFilter() {

44
hb_client/src/views/mtm/materialdo.vue
View File

@ -596,7 +596,7 @@
},
listQueryrecordform: {
page: 1,
page_size: 20,
page_size: 99,
},
recordformList: {
count: 0,
@ -694,10 +694,10 @@
],
typeOptions_:{
10 : "生产记录表",
20 : "工序检查表",
30 : "入厂检验表",
40 : "成品检验表",
50 : "首件检查表",
20 : "工序检查表",//wp p
30 : "入厂检验表",//wuliao
40 : "成品检验表",//p
50 : "首件检查表",//wp
},
materialTypes: {
"1": '成品',
@ -723,12 +723,19 @@
judgeList: [],
limitedPhoto: false,
isDisabled: true,
type:null,
};
},
computed: {},
watch: {},
mounted(){
this.item = JSON.parse(sessionStorage.getItem('materialItem')) ;
let type = sessionStorage.getItem('materialType') ;
if(type.indexOf(','>0)){
this.type = type.split(',');
}else{
this.type = parseInt(type);
}
this.material = this.item.id;
this.recordformLists();
getrecordformList({page:0}).then((response) => {
@ -896,13 +903,32 @@
this.fieldLists1();
},
recordformLists() {
this.listQueryrecordform.material = this.material;
// this.listQueryrecordform.type = 2;
getrecordformList(this.listQueryrecordform).then((response) => {
debugger;
let that = this;
that.listQueryrecordform.material = that.material;
if(that.type===10){
debugger;
that.listQueryrecordform.type = 10;
getrecordformList(that.listQueryrecordform).then((response) => {
if (response.data) {
this.recordformList = response.data;
that.recordformList = response.data;
}
});
}else{
debugger;
that.listQueryrecordform.type = that.type[0];
getrecordformList(that.listQueryrecordform).then((response) => {
if (response.data) {
that.recordformList = response.data;
that.listQueryrecordform.type = that.type[1];
getrecordformList(that.listQueryrecordform).then((response) => {
if (response.data) {
that.recordformList.results = that.recordformList.results.concat(response.data.results);
}
});
}
});
}
},
fieldLists() {
let that = this;

28
hb_client/src/views/mtm/productList.vue
View File

@ -216,8 +216,7 @@
}, {
value: '套',
label: '套'
},
{
}, {
value: '个',
label: '个'
}, {
@ -226,6 +225,24 @@
}, {
value: '瓶',
label: '瓶'
}, {
value: 'g',
label: 'g'
}, {
value: 'kg',
label: 'kg'
}, {
value: '卷',
label: '卷'
}, {
value: '张',
label: '张'
}, {
value: '支',
label: '支'
}, {
value: '袋',
label: '袋'
},
],
listQuery: {
@ -269,12 +286,19 @@
//检查表
handlebind(scope) {
let materialItem = sessionStorage.getItem('materialItem');
let materialType = sessionStorage.getItem('materialType');
if(materialItem){
sessionStorage.removeItem('materialItem');
sessionStorage.setItem('materialItem',JSON.stringify(scope.row));
}else{
sessionStorage.setItem('materialItem',JSON.stringify(scope.row));
}
if(materialType){
sessionStorage.removeItem('materialType');
sessionStorage.setItem('materialType','20,40');
}else{
sessionStorage.setItem('materialType','20,40');
}
this.$router.push({name: "MaterialDO", params: {id: scope.row.id}})
},
handleFilter() {

42
hb_client/src/views/mtm/step.vue
View File

@ -245,7 +245,8 @@
:model="tableForm"
:close-on-click-modal="false"
:visible.sync="dialogVisibleForm"
:title="tableForm.name">
:title="tableForm.name"
>
<el-form
label-width="200px"
label-position="right"
@ -312,6 +313,13 @@
</el-form-item>
</el-col>
</el-row>
<el-row style="box-sizing: border-box;padding-right: 50px">
<el-col v-for="(item,$index) in dialogFieldList" :key="$index" :span="12">
<el-form-item v-if="item.field_type==='draw'" :label="item.field_name">
<img style="width: 500px;" :src="item.draw_template" alt="tupian">
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-dialog>
</el-card>
@ -428,6 +436,20 @@
</el-col>
</el-row>
</el-form-item>
<el-form-item label="模板图片" v-if="field.field_type === 'draw'">
<el-upload
class="avatar-uploader"
:action="upUrl"
accept="image/jpeg, image/gif, image/png, image/bmp"
:show-file-list="false"
:on-success="handleAvatarSuccess"
:before-upload="beforeAvatarUpload"
:headers="upHeaders"
>
<img v-if="field.draw_template" :src="field.draw_template" class="avatar"/>
<i v-else class="el-icon-plus avatar-uploader-icon"/>
</el-upload>
</el-form-item>
<el-form-item label="排序" prop="sort">
<el-input-number v-model="field.sort" :min="1" placeholder="排序"></el-input-number>
</el-form-item>
@ -496,6 +518,7 @@
field_name: '',
sort: '',
field_choice: [""],
draw_template:''
},
field_choice: [''],
options: [],
@ -585,6 +608,10 @@
{
value: 'selects',
label: '多选'
},
{
value: 'draw',
label: '绘图模板'
}
],
formList:[],
@ -796,7 +823,18 @@
.catch(() => {
});
}
},
handleAvatarSuccess(res, file) {
debugger;
console.log(res)
this.field.draw_template = res.data.path;
},
beforeAvatarUpload(file) {
const isLt2M = file.size / 1024 / 1024 < 2;
if (!isLt2M) {
this.$message.error("上传头像图片大小不能超过 2MB!");
}
return isLt2M;
},
//新增字段
handlefieldCreate() {

28
hb_client/src/views/mtm/wproductList.vue
View File

@ -190,8 +190,7 @@
}, {
value: '套',
label: '套'
},
{
}, {
value: '个',
label: '个'
}, {
@ -200,6 +199,24 @@
}, {
value: '瓶',
label: '瓶'
}, {
value: 'g',
label: 'g'
}, {
value: 'kg',
label: 'kg'
}, {
value: '卷',
label: '卷'
}, {
value: '张',
label: '张'
}, {
value: '支',
label: '支'
}, {
value: '袋',
label: '袋'
},
],
listQuery: {
@ -242,12 +259,19 @@
//检查表
handlebind(scope) {
let materialItem = sessionStorage.getItem('materialItem');
let materialType = sessionStorage.getItem('materialType');
if(materialItem){
sessionStorage.removeItem('materialItem');
sessionStorage.setItem('materialItem',JSON.stringify(scope.row));
}else{
sessionStorage.setItem('materialItem',JSON.stringify(scope.row));
}
if(materialType){
sessionStorage.removeItem('materialType');
sessionStorage.setItem('materialType','20,50');
}else{
sessionStorage.setItem('materialType','20,50');
}
this.$router.push({name: "MaterialDO", params: {id: scope.row.id}})
},
handleFilter() {

4
hb_client/src/views/workflow/index.vue
View File

@ -119,7 +119,7 @@
</el-col>
</el-row>
<div style="width: 90%;margin: auto;">
<svg height=1000 id="mySvg" style="width:100%!important;">
<svg height=1500 id="mySvg" style="width:100%!important;">
</svg>
</div>
</div>
@ -356,7 +356,7 @@
var g = new dagreD3.graphlib.Graph().setGraph({
rankdir: 'DL',
nodesep: 100,
edgesep: 10,//两条线之间的距离
edgesep: 50,//两条线之间的距离
ranksep: 50,//节点之间的距离
marginx: 160,
marginy: 20,